mirror of
https://github.com/dgis/xsddiagram.git
synced 2024-09-11 18:47:19 +03:00
Show the enumerates documentation.
Add Ctrl+0 to reset the zoom. Fix the version number on the exe, and update the copyright year.
This commit is contained in:
parent
a325627210
commit
7d696ae57b
63
MainForm.Designer.cs
generated
63
MainForm.Designer.cs
generated
@ -59,15 +59,14 @@ namespace XSDDiagram
|
||||
this.splitContainerMain = new System.Windows.Forms.SplitContainer();
|
||||
this.tabControlView = new System.Windows.Forms.TabControl();
|
||||
this.tabPageDiagram = new System.Windows.Forms.TabPage();
|
||||
this.panelDiagram = new XSDDiagram.DiagramControlContainer();
|
||||
this.splitContainerDiagramElement = new System.Windows.Forms.SplitContainer();
|
||||
this.tabControlElement = new System.Windows.Forms.TabControl();
|
||||
this.tabPageElementAttibutes = new System.Windows.Forms.TabPage();
|
||||
this.listViewAttributes = new System.Windows.Forms.ListView();
|
||||
this.columnHeaderAttributesName = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderAttributesType = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderAttributesUse = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderAttributesDefault = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderAttributesName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.columnHeaderAttributesType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.columnHeaderAttributesUse = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.columnHeaderAttributesDefault = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.contextMenuStripAttributes = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.toolStripMenuItemAttributesCopyLine = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItemAttributesCopyList = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@ -75,15 +74,15 @@ namespace XSDDiagram
|
||||
this.propertyGridSchemaObject = new System.Windows.Forms.PropertyGrid();
|
||||
this.splitter1 = new System.Windows.Forms.Splitter();
|
||||
this.listViewEnumerate = new System.Windows.Forms.ListView();
|
||||
this.columnHeaderAttributeEnumerateName = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderAttributeEnumerateName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.contextMenuStripEnumerate = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.toolStripMenuItemEnumerateCopyLine = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItemEnumerateCopyList = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.splitterElementList = new System.Windows.Forms.Splitter();
|
||||
this.listViewElements = new System.Windows.Forms.ListView();
|
||||
this.columnHeaderElementListName = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderElementListType = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderElementListNamespace = new System.Windows.Forms.ColumnHeader();
|
||||
this.columnHeaderElementListName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.columnHeaderElementListType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.columnHeaderElementListNamespace = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
this.contextMenuStripElements = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.addToDiagrammToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator();
|
||||
@ -98,6 +97,7 @@ namespace XSDDiagram
|
||||
this.expandOneLevelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.textBoxElementPath = new System.Windows.Forms.TextBox();
|
||||
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.panelDiagram = new XSDDiagram.DiagramControlContainer();
|
||||
this.menuStripMain.SuspendLayout();
|
||||
this.statusStripMain.SuspendLayout();
|
||||
this.toolStripMain.SuspendLayout();
|
||||
@ -268,8 +268,8 @@ namespace XSDDiagram
|
||||
// previousTabToolStripMenuItem
|
||||
//
|
||||
this.previousTabToolStripMenuItem.Name = "previousTabToolStripMenuItem";
|
||||
this.previousTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
|
||||
| System.Windows.Forms.Keys.Tab)));
|
||||
this.previousTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
|
||||
| System.Windows.Forms.Keys.Tab)));
|
||||
this.previousTabToolStripMenuItem.Size = new System.Drawing.Size(228, 22);
|
||||
this.previousTabToolStripMenuItem.Text = "&Previous Tab";
|
||||
this.previousTabToolStripMenuItem.Click += new System.EventHandler(this.previousTabToolStripMenuItem_Click);
|
||||
@ -559,23 +559,6 @@ namespace XSDDiagram
|
||||
this.tabPageDiagram.Text = "Diagram";
|
||||
this.tabPageDiagram.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// panelDiagram
|
||||
//
|
||||
this.panelDiagram.AllowDrop = true;
|
||||
this.panelDiagram.AutoScroll = true;
|
||||
this.panelDiagram.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.panelDiagram.CausesValidation = false;
|
||||
this.panelDiagram.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panelDiagram.Location = new System.Drawing.Point(0, 0);
|
||||
this.panelDiagram.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelDiagram.Name = "panelDiagram";
|
||||
this.panelDiagram.Size = new System.Drawing.Size(650, 499);
|
||||
this.panelDiagram.TabIndex = 0;
|
||||
this.panelDiagram.VirtualPoint = new System.Drawing.Point(0, 0);
|
||||
this.panelDiagram.VirtualSize = new System.Drawing.Size(10, 10);
|
||||
this.panelDiagram.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelDiagram_DragDrop);
|
||||
this.panelDiagram.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelDiagram_DragEnter);
|
||||
//
|
||||
// splitContainerDiagramElement
|
||||
//
|
||||
this.splitContainerDiagramElement.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
@ -636,8 +619,8 @@ namespace XSDDiagram
|
||||
this.listViewAttributes.UseCompatibleStateImageBehavior = false;
|
||||
this.listViewAttributes.View = System.Windows.Forms.View.Details;
|
||||
this.listViewAttributes.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listView_AfterLabelEdit);
|
||||
this.listViewAttributes.SelectedIndexChanged += new System.EventHandler(this.listViewAttributes_SelectedIndexChanged);
|
||||
this.listViewAttributes.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewAttributes_ColumnClick);
|
||||
this.listViewAttributes.SelectedIndexChanged += new System.EventHandler(this.listViewAttributes_SelectedIndexChanged);
|
||||
//
|
||||
// columnHeaderAttributesName
|
||||
//
|
||||
@ -725,6 +708,7 @@ namespace XSDDiagram
|
||||
this.listViewEnumerate.TabIndex = 6;
|
||||
this.listViewEnumerate.UseCompatibleStateImageBehavior = false;
|
||||
this.listViewEnumerate.View = System.Windows.Forms.View.Details;
|
||||
this.listViewEnumerate.SelectedIndexChanged += new System.EventHandler(this.listViewEnumerate_SelectedIndexChanged);
|
||||
//
|
||||
// columnHeaderAttributeEnumerateName
|
||||
//
|
||||
@ -783,10 +767,10 @@ namespace XSDDiagram
|
||||
this.listViewElements.UseCompatibleStateImageBehavior = false;
|
||||
this.listViewElements.View = System.Windows.Forms.View.Details;
|
||||
this.listViewElements.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listView_AfterLabelEdit);
|
||||
this.listViewElements.DoubleClick += new System.EventHandler(this.listViewElement_DoubleClick);
|
||||
this.listViewElements.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewElement_ColumnClick);
|
||||
this.listViewElements.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.listViewElements_ItemDrag);
|
||||
this.listViewElements.Click += new System.EventHandler(this.listViewElement_Click);
|
||||
this.listViewElements.DoubleClick += new System.EventHandler(this.listViewElement_DoubleClick);
|
||||
//
|
||||
// columnHeaderElementListName
|
||||
//
|
||||
@ -914,6 +898,23 @@ namespace XSDDiagram
|
||||
this.toolTip.OwnerDraw = true;
|
||||
this.toolTip.ShowAlways = true;
|
||||
//
|
||||
// panelDiagram
|
||||
//
|
||||
this.panelDiagram.AllowDrop = true;
|
||||
this.panelDiagram.AutoScroll = true;
|
||||
this.panelDiagram.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.panelDiagram.CausesValidation = false;
|
||||
this.panelDiagram.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panelDiagram.Location = new System.Drawing.Point(0, 0);
|
||||
this.panelDiagram.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelDiagram.Name = "panelDiagram";
|
||||
this.panelDiagram.Size = new System.Drawing.Size(650, 499);
|
||||
this.panelDiagram.TabIndex = 0;
|
||||
this.panelDiagram.VirtualPoint = new System.Drawing.Point(0, 0);
|
||||
this.panelDiagram.VirtualSize = new System.Drawing.Size(10, 10);
|
||||
this.panelDiagram.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelDiagram_DragDrop);
|
||||
this.panelDiagram.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelDiagram_DragEnter);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AllowDrop = true;
|
||||
@ -926,12 +927,14 @@ namespace XSDDiagram
|
||||
this.Controls.Add(this.toolStripMain);
|
||||
this.Controls.Add(this.menuStripMain);
|
||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||
this.KeyPreview = true;
|
||||
this.MainMenuStrip = this.menuStripMain;
|
||||
this.Name = "MainForm";
|
||||
this.Text = "XSD Diagram";
|
||||
this.Load += new System.EventHandler(this.MainForm_Load);
|
||||
this.DragDrop += new System.Windows.Forms.DragEventHandler(this.MainForm_DragDrop);
|
||||
this.DragEnter += new System.Windows.Forms.DragEventHandler(this.MainForm_DragEnter);
|
||||
this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.MainForm_KeyUp);
|
||||
this.menuStripMain.ResumeLayout(false);
|
||||
this.menuStripMain.PerformLayout();
|
||||
this.statusStripMain.ResumeLayout(false);
|
||||
|
23
MainForm.cs
23
MainForm.cs
@ -872,7 +872,7 @@ namespace XSDDiagram
|
||||
{
|
||||
XMLSchema.facet facet = restriction.Items[i] as XMLSchema.facet;
|
||||
if (facet != null)
|
||||
this.listViewEnumerate.Items.Add(facet.value);
|
||||
this.listViewEnumerate.Items.Add(facet.value).Tag = facet;
|
||||
}
|
||||
}
|
||||
|
||||
@ -987,6 +987,18 @@ namespace XSDDiagram
|
||||
}
|
||||
}
|
||||
|
||||
private void listViewEnumerate_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (this.listViewEnumerate.SelectedItems.Count > 0)
|
||||
{
|
||||
XMLSchema.facet facet = this.listViewEnumerate.SelectedItems[0].Tag as XMLSchema.facet;
|
||||
if (facet != null && facet.annotation != null)
|
||||
ShowDocumentation(facet.annotation);
|
||||
else
|
||||
ShowDocumentation(null);
|
||||
}
|
||||
}
|
||||
|
||||
private void toolStripComboBoxZoom_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
@ -1663,6 +1675,15 @@ namespace XSDDiagram
|
||||
validateXMLFileToolStripMenuItem.Enabled = (schema != null && schema.XsdFilenames.Count != 0);
|
||||
}
|
||||
|
||||
private void MainForm_KeyUp(object sender, KeyEventArgs e)
|
||||
{
|
||||
if (e.Control && (e.KeyCode == Keys.D0 || e.KeyCode == Keys.NumPad0))
|
||||
{
|
||||
this.toolStripComboBoxZoom.SelectedIndex = 8;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//void DiagramControl_MouseMove(object sender, MouseEventArgs e)
|
||||
//{
|
||||
//System.Diagnostics.Trace.WriteLine("toolTipDiagramElement_Popup");
|
||||
|
@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("XSD Diagram")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2006-2012 Regis Cosnier, All Rights Reserved.")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2006-2013 Regis Cosnier, All Rights Reserved.")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
[assembly: AssemblyVersion("0.12.0.0")]
|
||||
[assembly: AssemblyFileVersion("0.12.0.0")]
|
||||
[assembly: AssemblyVersion("0.15.0.0")]
|
||||
[assembly: AssemblyFileVersion("0.15.0.0")]
|
||||
|
@ -1,6 +1,6 @@
|
||||
XSD Diagram is a free xml schema definition diagram viewer (http://regis.cosnier.free.fr).
|
||||
|
||||
Version 0.14 Copyright (c) 2006-2012 Regis Cosnier, All Rights Reserved.
|
||||
Version 0.15 Copyright (c) 2006-2013 Regis Cosnier, All Rights Reserved.
|
||||
|
||||
This program is free software and may be distributed
|
||||
according to the terms of the GNU General Public License (GPL).
|
||||
@ -92,6 +92,7 @@ TODO LIST:
|
||||
|
||||
- BUG: There is a bug when printing with margin!
|
||||
- BUG: On Linux, the horizontal and vertical scrollbars don't appear correctly.
|
||||
- From AlexM: oh, and allow the specification of a complex type in the command line as a root... for the same component used in multiple schemas from one library.
|
||||
- Add the attributes to the element in the diagram (suggested by bob)
|
||||
- Tooltips above the diagram element with a summary (xpath/attributes/doc) (display 200ms after the mouse move -> avoid 100 %CPU)
|
||||
o The optional display of attributes inside the diagram
|
||||
@ -105,6 +106,10 @@ TODO LIST:
|
||||
|
||||
CHANGES:
|
||||
|
||||
version 0.15 (2013-01-13)
|
||||
- Show the enumerates documentation.
|
||||
- Add Ctrl+0 to reset the zoom
|
||||
|
||||
version 0.14 (2012-12-01)
|
||||
- Accept all kind of https certificates when the xsd dependencies (import or include) point to a TLS/SSL url.
|
||||
- Prompt the user to authenticate when the xsd dependencies (import or include) point toward a secured url.
|
||||
@ -191,7 +196,7 @@ version 0.1 (2006-09-14)
|
||||
|
||||
LICENSE:
|
||||
|
||||
Copyright (c) 2006-2012 Regis COSNIER, All Rights Reserved.
|
||||
Copyright (c) 2006-2013 Regis COSNIER, All Rights Reserved.
|
||||
|
||||
This program is free software and may be distributed
|
||||
according to the terms of the GNU General Public License (GPL).
|
||||
|
BIN
XSDDiagram.exe
BIN
XSDDiagram.exe
Binary file not shown.
Binary file not shown.
3
test.bat
3
test.bat
@ -8,4 +8,5 @@ start "" /wait XSDDiagramConsole.exe -o Tests\file.svg -r COLLADA -e 3 Tests\COL
|
||||
XSDDiagramConsole.exe -os png -r COLLADA -e 3 -y Tests\COLLADASchema_141.xsd > Tests\stdout.png
|
||||
XSDDiagramConsole.exe -os jpg -r COLLADA -e 3 -y Tests\COLLADASchema_141.xsd > Tests\stdout.jpg
|
||||
XSDDiagramConsole.exe -os svg -r COLLADA -e 3 -y Tests\COLLADASchema_141.xsd > Tests\stdout.svg
|
||||
@pause
|
||||
XSDDiagramConsole.exe -h
|
||||
@pause
|
||||
|
Loading…
Reference in New Issue
Block a user