Browse Source

Rename FormDesigner to FormsDesigner.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@855 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 21 years ago
parent
commit
48939e61d6
  1. 8
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 40
      doc/technotes/AddInManager.rtf
  3. 10
      src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
  4. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj
  5. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
  6. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/BooDesignerGenerator.cs
  7. 10
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/BooDesignerLoader.cs
  8. 8
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/FormsDesignerBinding.cs
  9. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Configuration/AssemblyInfo.cs
  10. 29
      src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj
  11. 106
      src/AddIns/DisplayBindings/FormDesigner/Project/FormsDesigner.addin
  12. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Resources/AddSidebarComponentsDialog.xfrm
  13. 82
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/Commands/FormsCommands.cs
  14. 6
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/Commands/SideBarCommands.cs
  15. 10
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/AbstractDesignerGenerator.cs
  16. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CSharpDesignerGenerator.cs
  17. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CodeDOMGenerator.cs
  18. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/IDesignerGenerator.cs
  19. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/VBNetDesignerGenerator.cs
  20. 6
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/XmlDesignerGenerator.cs
  21. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/DesignerLoaderProvider.cs
  22. 32
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/FormDesignerLoadException.cs
  23. 32
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/FormsDesignerLoadException.cs
  24. 12
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/NRefactoryDesignerLoader.cs
  25. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/XmlDesignerLoader.cs
  26. 36
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerViewContent.cs
  27. 8
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormKeyHandler.cs
  28. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/AddComponentsDialog.cs
  29. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ComponentLibraryLoader.cs
  30. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ConfigureSideBarDialog.cs
  31. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/CustomComponentsSideTab.cs
  32. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/OptionPanels/GridOptions.cs
  33. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/RenameCategoryDialog.cs
  34. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ShowTabOrder/ITabOrder.cs
  35. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ShowTabOrder/TabIndexControl.cs
  36. 20
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/SideTabDesigner.cs
  37. 4
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/SideTabItemDesigner.cs
  38. 641
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/AbstractMenuEditorControl.cs
  39. 71
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/ContextMenuEditorControl.cs
  40. 81
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/ItemEditor.cs
  41. 33
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/MainMenuEditorControl.cs
  42. 52
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/MenuDesigner.cs
  43. 134
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/MenuEditorService.cs
  44. 139
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/SubMenuEditorControl.cs
  45. 8
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/SecondaryDisplayBinding.cs
  46. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DefaultServiceContainer.cs
  47. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DesignerEventService.cs
  48. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DesignerOptionService.cs
  49. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DesignerResourceService.cs
  50. 10
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/EventBindingService.cs
  51. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/HelpService.cs
  52. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/MenuCommandService.cs
  53. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/PropertyValueUIService.cs
  54. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/ToolboxService.cs
  55. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeDescriptorFilterService.cs
  56. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeDiscoveryService.cs
  57. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeResolutionService.cs
  58. 2
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/UIService.cs
  59. 14
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/ToolboxProvider.cs
  60. 6
      src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/UndoRedo/UndoEngine.cs
  61. 3
      src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
  62. 4
      src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingDoozer.cs

8
AddIns/ICSharpCode.SharpDevelop.addin

@ -709,7 +709,7 @@ @@ -709,7 +709,7 @@
<And>
<Or>
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormDesigner.FormDesignerViewContent"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormsDesigner.FormsDesignerViewContent"/>
</Or>
<Condition name = "ActiveViewContentUntitled" activewindowuntitled="False"/>
</And>
@ -1174,7 +1174,7 @@ @@ -1174,7 +1174,7 @@
<And>
<Or>
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormDesigner.FormDesignerViewContent"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormsDesigner.FormsDesignerViewContent"/>
</Or>
<Condition name = "ActiveViewContentUntitled" activewindowuntitled="False"/>
</And>
@ -1219,7 +1219,7 @@ @@ -1219,7 +1219,7 @@
<And>
<Or>
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormDesigner.FormDesignerViewContent"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormsDesigner.FormsDesignerViewContent"/>
</Or>
<Condition name = "ActiveViewContentUntitled" activewindowuntitled="False"/>
</And>
@ -1303,7 +1303,7 @@ @@ -1303,7 +1303,7 @@
<ComplexCondition action = "Disable">
<Or>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormDesigner.FormDesignerViewContent"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormsDesigner.FormsDesignerViewContent"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider"/>
</Or>
<Condition name="ActiveContentExtension" activeextension=".cs" action = "Disable">

40
doc/technotes/AddInManager.rtf

@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1031\deflangfe1031{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}
{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f139\froman\fcharset238\fprq2 Times New Roman CE;}{\f140\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f142\froman\fcharset161\fprq2 Times New Roman Greek;}
{\f143\froman\fcharset162\fprq2 Times New Roman Tur;}{\f144\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f145\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f146\froman\fcharset186\fprq2 Times New Roman Baltic;}
{\f147\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f149\fswiss\fcharset238\fprq2 Arial CE;}{\f150\fswiss\fcharset204\fprq2 Arial Cyr;}{\f152\fswiss\fcharset161\fprq2 Arial Greek;}{\f153\fswiss\fcharset162\fprq2 Arial Tur;}
{\f154\fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f155\fswiss\fcharset178\fprq2 Arial (Arabic);}{\f156\fswiss\fcharset186\fprq2 Arial Baltic;}{\f157\fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f159\fmodern\fcharset238\fprq1 Courier New CE;}
{\f160\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f162\fmodern\fcharset161\fprq1 Courier New Greek;}{\f163\fmodern\fcharset162\fprq1 Courier New Tur;}{\f164\fmodern\fcharset177\fprq1 Courier New (Hebrew);}
{\f165\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f166\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f167\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;
{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f37\froman\fcharset238\fprq2 Times New Roman CE;}{\f38\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f40\froman\fcharset161\fprq2 Times New Roman Greek;}
{\f41\froman\fcharset162\fprq2 Times New Roman Tur;}{\f42\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f43\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f44\froman\fcharset186\fprq2 Times New Roman Baltic;}
{\f45\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f47\fswiss\fcharset238\fprq2 Arial CE;}{\f48\fswiss\fcharset204\fprq2 Arial Cyr;}{\f50\fswiss\fcharset161\fprq2 Arial Greek;}{\f51\fswiss\fcharset162\fprq2 Arial Tur;}
{\f52\fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f53\fswiss\fcharset178\fprq2 Arial (Arabic);}{\f54\fswiss\fcharset186\fprq2 Arial Baltic;}{\f55\fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f57\fmodern\fcharset238\fprq1 Courier New CE;}
{\f58\fmodern\fcharset204\fprq1 Courier New Cyr;}{\f60\fmodern\fcharset161\fprq1 Courier New Greek;}{\f61\fmodern\fcharset162\fprq1 Courier New Tur;}{\f62\fmodern\fcharset177\fprq1 Courier New (Hebrew);}
{\f63\fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f64\fmodern\fcharset186\fprq1 Courier New Baltic;}{\f65\fmodern\fcharset163\fprq1 Courier New (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;
\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;
\red128\green128\blue128;\red192\green192\blue192;\red139\green0\blue139;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \snext0 \styrsid2436208 Normal;}{
\s1\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \b\fs48\lang1031\langfe1031\kerning36\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext1 \styrsid2436208 heading 1;}{
\s2\ql \li0\ri0\sb240\sa60\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \b\i\f1\fs28\lang1031\langfe1031\cgrid\langnp1031\langfenp1031 \sbasedon0 \snext0 \styrsid2436208 heading 2;}{\*\cs10 \additive \ssemihidden
Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\listtable{\list\listtemplateid1948972076
\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67567631\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc4\levelnfcn4
\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67567641\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0
@ -22,10 +22,10 @@ Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpad @@ -22,10 +22,10 @@ Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpad
\listoverridecount9{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel
\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}{\lfolevel\listoverridestartat\levelstartat1}\ls1}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid92776\rsid162269
\rsid275879\rsid282022\rsid354646\rsid486424\rsid788270\rsid872985\rsid1071947\rsid1200377\rsid1316785\rsid1513728\rsid2234982\rsid2436208\rsid2520943\rsid2647199\rsid2842370\rsid2893809\rsid3089817\rsid3101537\rsid3551716\rsid4267723\rsid4460333
\rsid4677887\rsid4923913\rsid4930835\rsid5113596\rsid5664565\rsid5792094\rsid7228817\rsid7370522\rsid7553324\rsid7569188\rsid8219353\rsid8549883\rsid8941365\rsid9114940\rsid9778202\rsid9922418\rsid10039453\rsid10122864\rsid10317377\rsid10424196
\rsid10442943\rsid10510865\rsid11092842\rsid11287406\rsid11412105\rsid11754104\rsid12064313\rsid12190290\rsid12398247\rsid12721314\rsid12869452\rsid13183743\rsid13246204\rsid14247584\rsid14425394\rsid14484346\rsid15097273\rsid15277116\rsid15285540
\rsid15428640\rsid15619894\rsid15929841\rsid16607764}{\*\generator Microsoft Word 11.0.6502;}{\info{\title AddInManager}{\author mich}{\operator mich}{\creatim\yr2005\mo11\dy29\hr19\min58}{\revtim\yr2005\mo11\dy29\hr20\min46}{\version68}{\edmins0}
{\nofpages2}{\nofwords714}{\nofchars4501}{\nofcharsws5205}{\vern24579}}\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1134
\rsid4677887\rsid4923913\rsid4930835\rsid5113596\rsid5664565\rsid5792094\rsid7228817\rsid7370522\rsid7553324\rsid7569188\rsid8219353\rsid8549883\rsid8941365\rsid9114940\rsid9778202\rsid9793049\rsid9922418\rsid10039453\rsid10122864\rsid10317377
\rsid10424196\rsid10442943\rsid10510865\rsid11092842\rsid11287406\rsid11412105\rsid11754104\rsid12064313\rsid12190290\rsid12398247\rsid12721314\rsid12869452\rsid13183743\rsid13246204\rsid13842745\rsid14247584\rsid14425394\rsid14484346\rsid15097273
\rsid15277116\rsid15285540\rsid15428640\rsid15619894\rsid15929841\rsid16607764}{\*\generator Microsoft Word 11.0.6502;}{\info{\title AddInManager}{\author mich}{\operator mich}{\creatim\yr2005\mo11\dy29\hr19\min58}{\revtim\yr2005\mo12\dy8\hr19\min16}
{\version69}{\edmins0}{\nofpages2}{\nofwords714}{\nofchars4502}{\nofcharsws5206}{\vern24579}}\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1134
\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1417\dgvorigin1417\dghshow1\dgvshow1
\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
\asianbrkrule\rsidroot2436208\newtblstyruls\nogrowautofit \fet0\sectd \linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2
@ -67,8 +67,8 @@ If you have created an AddIn using the template, it will not show up in the AddI @@ -67,8 +67,8 @@ If you have created an AddIn using the template, it will not show up in the AddI
\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid275879\charrsid15428640 , it is}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 display}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid275879\charrsid15428640 ed}{
\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 in the AddInManager"}{\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 >}{\f2\fs20\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640
\line }{\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 <Manifest>}{\f2\fs20\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 \line }{
\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 <Identity }{\f2\fs20\cf6\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 name}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 ="
ExampleAuthor.AddInName"}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913 }{\f2\fs20\cf6\lang1033\langfe1031\langnp1033\insrsid4923913\charrsid4923913 version}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913 =}{
\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 <Identity }{\f2\fs20\cf6\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 name}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640
="ExampleAuthor.AddInName"}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913 }{\f2\fs20\cf6\lang1033\langfe1031\langnp1033\insrsid4923913\charrsid4923913 version}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913 =}{
\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913\charrsid4923913 "@}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913 MyAd}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid7553324 d}{
\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913 In}{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid4923913\charrsid4923913 .dll"}{\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid2436208\charrsid15428640 />}{
\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid13183743\charrsid15428640
@ -80,8 +80,8 @@ addin }{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid13183743\charrsid1542 @@ -80,8 +80,8 @@ addin }{\f2\fs20\cf2\lang1033\langfe1031\langnp1033\insrsid13183743\charrsid1542
\par }{\lang1033\langfe1031\langnp1033\insrsid2436208
\par }{\lang1033\langfe1031\langnp1033\insrsid13183743 After }{\lang1033\langfe1031\langnp1033\insrsid162269 adding the <Manifest> section}{\lang1033\langfe1031\langnp1033\insrsid10442943 , your AddIn will show up in the AddInManager:}{
\lang1033\langfe1031\langnp1033\insrsid2436208
\par }{\lang1033\langfe1031\langnp1033\insrsid15929841\charrsid15929841 {\*\shppict{\pict{\*\picprop\shplid1034{\sp{\sn shapeType}{\sv 75}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}}{\sp{\sn pibFlags}{\sv 2}}{\sp{\sn fLine}{\sv 0}}
{\sp{\sn fLayoutInCell}{\sv 1}}}\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw8782\pich953\picwgoal4979\pichgoal540\pngblip\bliptag344806475{\*\blipuid 148d544b5457de0346f0cfd431565dbc}
\par }{\lang1033\langfe1031\langnp1033\insrsid13842745\charrsid15929841 {\*\shppict{\pict{\*\picprop\shplid1025{\sp{\sn shapeType}{\sv 75}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}}{\sp{\sn pibFlags}{\sv 2}}{\sp{\sn fLine}{\sv 0}}
{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}}\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0\picw8782\pich953\picwgoal4979\pichgoal540\pngblip\bliptag344806475{\*\blipuid 148d544b5457de0346f0cfd431565dbc}
89504e470d0a1a0a0000000d494844520000014c0000002408020000006ddc948b000000017352474200aece1ce9000000097048597300000ec400000ec201c3
71a99d00001bd049444154785eed5d677c56c59a7fdddf7e70ddfd70e9a04811c51557028420104a8084901008bd17418a4a1105af82085c14418a80885ca404
105120426889b450052108c8bd628184a0588080eefdb077bf9877ff33cfd433e72d0911567f797fe3c99c39d39ef27f9e67e6cc91bb82c160a0fc57ce81720e
@ -758,9 +758,9 @@ ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff @@ -758,9 +758,9 @@ ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff7f7ffffff040000002701ffff030000000000}}}{\lang1033\langfe1031\langnp1033\insrsid2436208
\par }{\lang1033\langfe1031\langnp1033\insrsid9922418 For the attribute \'93version\'94, you can directly specify a version number or use the syntax \'93@filename\'94 to get the version from the file.
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4930835 {\lang1033\langfe1031\langnp1033\insrsid4930835 For your
AddIns, make sure you use a new version number for every release so that other AddIns can check for specific versions of your AddIn.}{\lang1033\langfe1031\langnp1033\insrsid5113596 The easiest way to do this is to use the auto
-numbering of the C# compiler together with version=\'93@MyAddIn.dll\'94.}{\lang1033\langfe1031\langnp1033\insrsid4930835
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid4930835 {\lang1033\langfe1031\langnp1033\insrsid4930835
For your AddIns, make sure you use a new version number for every release so that other AddIns can check for specific versions of your AddIn.}{\lang1033\langfe1031\langnp1033\insrsid5113596 The ea
siest way to do this is to use the auto-numbering of the C# compiler together with version=\'93@MyAddIn.dll\'94.}{\lang1033\langfe1031\langnp1033\insrsid4930835
\par }\pard \ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2436208 {\lang1033\langfe1031\langnp1033\insrsid10442943
\par }{\lang1033\langfe1031\langnp1033\insrsid15097273 As you can see, you can specify dependencies to other AddIns in the manifest section:}{\lang1033\langfe1031\langnp1033\insrsid10442943
\par }{\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid15097273\charrsid15428640 <Dependency }{\f2\fs20\cf6\lang1033\langfe1031\langnp1033\insrsid15097273\charrsid15428640 addin }{
@ -773,8 +773,8 @@ AddIns, make sure you use a new version number for every release so that other A @@ -773,8 +773,8 @@ AddIns, make sure you use a new version number for every release so that other A
\lang1033\langfe1031\langnp1033\insrsid7569188 is the main SharpDevelop application. }{\lang1033\langfe1031\langnp1033\insrsid11754104 SharpDevelop itself is also an AddIn, but }{\lang1033\langfe1031\langnp1033\insrsid1513728 in this special case we don
\rquote t use the \'93ICSharpCode\'94}{\lang1033\langfe1031\langnp1033\insrsid10424196 prefix.}{\lang1033\langfe1031\langnp1033\insrsid1316785 }{\lang1033\langfe1031\langnp1033\insrsid2234982 Another example is:}{
\f2\lang1033\langfe1031\langnp1033\insrsid2234982\charrsid14247584
\par }{\f2\fs20\cf17\insrsid2234982\charrsid14247584 <Dependency }{\f2\fs20\cf6\insrsid2234982\charrsid14247584 addin }{\f2\fs20\cf2\insrsid2234982\charrsid14247584 = "ICSharpCode.FormDesigner"}{\f2\fs20\cf17\insrsid2234982\charrsid14247584 />}{
\f2\fs20\cf17\insrsid2234982\charrsid14247584
\par }{\f2\fs20\cf17\insrsid2234982\charrsid14247584 <Dependency }{\f2\fs20\cf6\insrsid2234982\charrsid14247584 addin }{\f2\fs20\cf2\insrsid2234982\charrsid14247584 = "ICSharpCode.Form}{\f2\fs20\cf2\insrsid9793049 s}{
\f2\fs20\cf2\insrsid2234982\charrsid14247584 Designer"}{\f2\fs20\cf17\insrsid2234982\charrsid14247584 />
\par }{\lang1033\langfe1031\langnp1033\insrsid2234982 The official AddIns don\rquote t have any version }{\lang1033\langfe1031\langnp1033\insrsid354646 number;}{\lang1033\langfe1031\langnp1033\insrsid92776 please check the version of SharpDevelop instead.}{
\lang1033\langfe1031\langnp1033\insrsid15619894
\par }{\lang1033\langfe1031\langnp1033\insrsid4930835 You should}{\lang1033\langfe1031\langnp1033\insrsid9114940 always add a version dependency on SharpDevelop: \line }{\f2\fs20\cf17\lang1033\langfe1031\langnp1033\insrsid4930835\charrsid15428640 <Dependency

10
src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@ -6,11 +6,11 @@ @@ -6,11 +6,11 @@
<Manifest>
<Identity name = "ICSharpCode.BooBinding"/>
<Dependency addin = "ICSharpCode.FormDesigner"/>
<Dependency addin = "ICSharpCode.FormsDesigner"/>
</Manifest>
<Runtime>
<Import assembly = "$ICSharpCode.FormDesigner/FormDesigner.dll"/>
<Import assembly = "$ICSharpCode.FormsDesigner/FormsDesigner.dll"/>
<Import assembly = "BooBinding.dll"/>
<Import assembly = ":ICSharpCode.SharpDevelop"/>
</Runtime>
@ -57,11 +57,11 @@ @@ -57,11 +57,11 @@
</Path>
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "BooFormDesigner"
<DisplayBinding id = "BooFormsDesigner"
type = "Secondary"
fileNamePattern = "\.boo$"
languagePattern = "^Boo$"
class = "Grunwald.BooBinding.Designer.FormDesignerDisplayBinding" />
class = "Grunwald.BooBinding.Designer.FormsDesignerDisplayBinding" />
</Path>
<Path path = "/SharpDevelop/BackendBindings/ProjectOptions/Boo">
@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
<ComplexCondition action = "Disable">
<And>
<Or>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormDesigner.FormDesignerViewContent"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.FormsDesigner.FormsDesignerViewContent"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider"/>
</Or>
<Or>

2
src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj

@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
<Compile Include="Src\ConvertBuffer.cs" />
<Compile Include="Src\Designer\BooDesignerGenerator.cs" />
<Compile Include="Src\Designer\BooDesignerLoader.cs" />
<Compile Include="Src\Designer\FormDesignerBinding.cs" />
<Compile Include="Src\Designer\FormsDesignerBinding.cs" />
<Compile Include="Src\Designer\CodeDomVisitor.cs" />
<Compile Include="Src\BooCodeGenerator.cs" />
<Compile Include="Src\CodeCompletion\ElementReturnType.cs" />

2
src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj

@ -20,6 +20,6 @@ copy "%1\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" . @@ -20,6 +20,6 @@ copy "%1\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" .
</ItemGroup>
<Target Name="MyPostBuildTarget">
<Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />
<Delete Files="$(OutputPath)\FormDesigner.addin" ContinueOnError="True"/>
<Delete Files="$(OutputPath)\FormsDesigner.addin" ContinueOnError="True"/>
</Target>
</Project>

2
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/BooDesignerGenerator.cs

@ -12,7 +12,7 @@ using System.Reflection; @@ -12,7 +12,7 @@ using System.Reflection;
using System.CodeDom;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.FormDesigner;
using ICSharpCode.FormsDesigner;
namespace Grunwald.BooBinding.Designer
{

10
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/BooDesignerLoader.cs

@ -21,8 +21,8 @@ using ICSharpCode.Core; @@ -21,8 +21,8 @@ using ICSharpCode.Core;
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Document;
using ICSharpCode.FormDesigner;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner;
using ICSharpCode.FormsDesigner.Services;
using Boo.Lang.Parser;
using Boo.Lang.Compiler.Ast;
@ -102,7 +102,7 @@ namespace Grunwald.BooBinding.Designer @@ -102,7 +102,7 @@ namespace Grunwald.BooBinding.Designer
LoggingService.Debug("BooDesignerLoader.Parse() finished");
return ccu;
} catch (Boo.Lang.Compiler.CompilerError ex) {
throw new FormDesignerLoadException(ex.ToString(true));
throw new FormsDesignerLoadException(ex.ToString(true));
}
}
@ -119,7 +119,7 @@ namespace Grunwald.BooBinding.Designer @@ -119,7 +119,7 @@ namespace Grunwald.BooBinding.Designer
});
if (errors.Length > 0) {
throw new FormDesignerLoadException(errors.ToString());
throw new FormsDesignerLoadException(errors.ToString());
}
// Try to fix the type names to fully qualified ones
@ -129,7 +129,7 @@ namespace Grunwald.BooBinding.Designer @@ -129,7 +129,7 @@ namespace Grunwald.BooBinding.Designer
bool foundInitMethod = false;
//FixTypeNames(p.CompilationUnit, parseInfo.BestCompilationUnit, ref foundInitMethod);
if (!foundInitMethod)
throw new FormDesignerLoadException("The InitializeComponent method was not found. Designer cannot be loaded.");
throw new FormsDesignerLoadException("The InitializeComponent method was not found. Designer cannot be loaded.");
*/
CodeDomVisitor visitor = new CodeDomVisitor(parseInfo.MostRecentCompilationUnit.ProjectContent);

8
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/FormDesignerBinding.cs → src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/FormsDesignerBinding.cs

@ -12,12 +12,12 @@ using ICSharpCode.Core; @@ -12,12 +12,12 @@ using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.FormDesigner;
using ICSharpCode.FormsDesigner;
using ICSharpCode.TextEditor;
namespace Grunwald.BooBinding.Designer
{
public class FormDesignerDisplayBinding : ISecondaryDisplayBinding
public class FormsDesignerDisplayBinding : ISecondaryDisplayBinding
{
public bool CanAttachTo(IViewContent viewContent)
{
@ -29,7 +29,7 @@ namespace Grunwald.BooBinding.Designer @@ -29,7 +29,7 @@ namespace Grunwald.BooBinding.Designer
return false;
if (Path.GetExtension(fileName).Equals(".boo", StringComparison.InvariantCultureIgnoreCase)) {
ParseInformation info = ParserService.ParseFile(fileName, textAreaControlProvider.TextEditorControl.Document.TextContent, false, true);
if (FormDesignerSecondaryDisplayBinding.IsDesignable(info))
if (FormsDesignerSecondaryDisplayBinding.IsDesignable(info))
return true;
}
}
@ -40,7 +40,7 @@ namespace Grunwald.BooBinding.Designer @@ -40,7 +40,7 @@ namespace Grunwald.BooBinding.Designer
{
IDesignerLoaderProvider loader = new BooDesignerLoaderProvider(((ITextEditorControlProvider)viewContent).TextEditorControl);
IDesignerGenerator generator = new BooDesignerGenerator();
return new ISecondaryViewContent[] { new FormDesignerViewContent(viewContent, loader, generator) };
return new ISecondaryViewContent[] { new FormsDesignerViewContent(viewContent, loader, generator) };
}
}

2
src/AddIns/DisplayBindings/FormDesigner/Project/Configuration/AssemblyInfo.cs

@ -14,7 +14,7 @@ using System.Runtime.CompilerServices; @@ -14,7 +14,7 @@ using System.Runtime.CompilerServices;
// change them to the information which is associated with the assembly
// you compile.
[assembly: AssemblyTitle("SharpDevelopFormDesigner")]
[assembly: AssemblyTitle("SharpDevelop Windows.Forms Designer")]
[assembly: AssemblyDescription("A Windows.Forms designer implementation")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("www.icsharpcode.net")]

29
src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj

@ -5,22 +5,24 @@ @@ -5,22 +5,24 @@
<ProductVersion>8.0.50215</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}</ProjectGuid>
<AssemblyName>FormDesigner</AssemblyName>
<AssemblyName>FormsDesigner</AssemblyName>
<OutputTarget>Library</OutputTarget>
<WarningLevel>4</WarningLevel>
<NoStdLib>False</NoStdLib>
<NoConfig>False</NoConfig>
<RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.FormDesigner</RootNamespace>
<RootNamespace>ICSharpCode.FormsDesigner</RootNamespace>
<DebugType>Full</DebugType>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<PlatformTarget>AnyCPU</PlatformTarget>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\FormDesigner\</OutputPath>
<OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\FormsDesigner\</OutputPath>
<DebugSymbols>true</DebugSymbols>
<BaseAddress>4194304</BaseAddress>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<Optimize>True</Optimize>
@ -44,7 +46,7 @@ @@ -44,7 +46,7 @@
<EmbeddedResource Include="Resources\RenameSidebarCategoryDialog.xfrm" />
<EmbeddedResource Include="Resources\WindowsFormsGridOptions.xfrm" />
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\Commands\FormCommands.cs" />
<Compile Include="Src\Commands\FormsCommands.cs" />
<Compile Include="Src\Commands\SideBarCommands.cs" />
<Compile Include="Src\FormDesigner\DesignerGenerator\CodeDOMGenerator.cs" />
<Compile Include="Src\FormDesigner\DesignerGenerator\CSharpDesignerGenerator.cs" />
@ -52,8 +54,8 @@ @@ -52,8 +54,8 @@
<Compile Include="Src\FormDesigner\DesignerGenerator\XmlDesignerGenerator.cs" />
<Compile Include="Src\FormDesigner\DesignerLoader\NRefactoryDesignerLoader.cs" />
<Compile Include="Src\FormDesigner\DesignerLoader\XmlDesignerLoader.cs" />
<Compile Include="Src\FormDesigner\FormDesignerSecondaryDisplayBinding.cs" />
<Compile Include="Src\FormDesigner\FormDesignerViewContent.cs" />
<Compile Include="Src\FormDesigner\SecondaryDisplayBinding.cs" />
<Compile Include="Src\FormDesigner\DesignerViewContent.cs" />
<Compile Include="Src\FormDesigner\FormKeyHandler.cs" />
<Compile Include="Src\FormDesigner\Gui\AddComponentsDialog.cs">
<SubType>Form</SubType>
@ -75,13 +77,6 @@ @@ -75,13 +77,6 @@
</Compile>
<Compile Include="Src\FormDesigner\Gui\SideTabDesigner.cs" />
<Compile Include="Src\FormDesigner\Gui\SideTabItemDesigner.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\AbstractMenuEditorControl.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\ContextMenuEditorControl.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\ItemEditor.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\MainMenuEditorControl.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\MenuDesigner.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\MenuEditorService.cs" />
<Compile Include="Src\FormDesigner\MenuDesigner\SubMenuEditorControl.cs" />
<Compile Include="Src\FormDesigner\Services\DefaultServiceContainer.cs" />
<Compile Include="Src\FormDesigner\Services\DesignerEventService.cs" />
<Compile Include="Src\FormDesigner\Services\DesignerOptionService.cs" />
@ -97,15 +92,15 @@ @@ -97,15 +92,15 @@
<Compile Include="Src\FormDesigner\ToolboxProvider.cs" />
<EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.FormDesigner.Gui.AssemblyList.resources" />
<EmbeddedResource Include="Src\FormDesigner\Gui\ICSharpCode.SharpDevelop.Gui.Dialogs.OptionPanels.ControlLibrariesPanel.resources" />
<None Include="FormDesigner.addin">
<None Include="FormsDesigner.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Compile Include="Src\FormDesigner\DesignerGenerator\VBNetDesignerGenerator.cs" />
<Compile Include="Src\FormDesigner\DesignerLoader\DesignerLoaderProvider.cs" />
<Compile Include="Src\FormDesigner\DesignerLoader\FormDesignerLoadException.cs" />
<Compile Include="Src\FormDesigner\DesignerLoader\FormsDesignerLoadException.cs" />
<Compile Include="Src\FormDesigner\DesignerGenerator\AbstractDesignerGenerator.cs" />
<Compile Include="Src\FormDesigner\Services\TypeDiscoveryService.cs" />
<Compile Include="Src\FormDesigner\UndoRedo\FormDesignerUndoEngine.cs" />
<Compile Include="Src\FormDesigner\UndoRedo\UndoEngine.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
@ -128,8 +123,6 @@ @@ -128,8 +123,6 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<Folder Include="Src\FormDesigner\Util\" />
<Folder Include="Src\FormDesigner\Xml\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>

106
src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.addin → src/AddIns/DisplayBindings/FormDesigner/Project/FormsDesigner.addin

@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
<AddIn name = "Form Designer"
<AddIn name = "Forms Designer"
author = "Mike Krueger"
copyright = "GPL"
description = "SharpDevelop Form Designer">
description = "Windows Forms Designer">
<Manifest>
<Identity name = "ICSharpCode.FormDesigner"/>
<Identity name = "ICSharpCode.FormsDesigner"/>
</Manifest>
<Runtime>
<Import assembly = "FormDesigner.dll"/>
<Import assembly = "FormsDesigner.dll"/>
<Import assembly = ":ICSharpCode.SharpDevelop"/>
</Runtime>
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "FormDesigner"
<DisplayBinding id = "FormsDesigner"
type = "Secondary"
class = "ICSharpCode.FormDesigner.FormDesignerSecondaryDisplayBinding"
class = "ICSharpCode.FormsDesigner.FormsDesignerSecondaryDisplayBinding"
fileNamePattern = "\.(cs|vb|xfrm)$"/>
</Path>
@ -23,32 +23,32 @@ @@ -23,32 +23,32 @@
<MenuItem id = "ViewCode"
label = "${res:SharpDevelop.FormsDesigner.ContextMenus.ViewCodeCommand}"
icon = "Icons.16x16.FormsDesigner.ViewCode"
class = "ICSharpCode.FormDesigner.Commands.ViewCode"/>
class = "ICSharpCode.FormsDesigner.Commands.ViewCode"/>
<MenuItem id = "ViewCodeSeparator" type = "Separator"/>
<MenuItem id = "BringToFront"
label = "${res:XML.MainMenu.FormatMenu.HorizontalSpacingMenu.BringToFront}"
icon = "Icons.16x16.FormsDesigner.BringToFront"
class = "ICSharpCode.FormDesigner.Commands.BringToFront"/>
class = "ICSharpCode.FormsDesigner.Commands.BringToFront"/>
<MenuItem id = "SendToBack"
label = "${res:XML.MainMenu.FormatMenu.OrderMenu.SendToBack}"
icon = "Icons.16x16.FormsDesigner.SendToBack"
class = "ICSharpCode.FormDesigner.Commands.SendToBack"/>
class = "ICSharpCode.FormsDesigner.Commands.SendToBack"/>
<MenuItem id = "OrderSeparator" type = "Separator"/>
<MenuItem id = "AlignToGrid"
label = "${res:SharpDevelop.FormsDesigner.ContextMenus.SelectionMenu.AlignToGrid}"
icon = "Icons.16x16.FormsDesigner.AlignToGrid"
class = "ICSharpCode.FormDesigner.Commands.AlignToGrid"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignToGrid"/>
<MenuItem id = "AlignSeparator" type = "Separator"/>
<MenuItem id = "ViewTabOrder"
label = "${res:XML.MainMenu.FormatMenu.ShowTabOrder}"
class = "ICSharpCode.FormDesigner.Commands.ViewTabOrder"/>
class = "ICSharpCode.FormsDesigner.Commands.ViewTabOrder"/>
<MenuItem id = "Lock"
label = "${res:XML.MainMenu.FormatMenu.Lock}"
icon = "Icons.16x16.FormsDesigner.LockControls"
class = "ICSharpCode.FormDesigner.Commands.LockControls"/>
class = "ICSharpCode.FormsDesigner.Commands.LockControls"/>
<MenuItem id = "LockSeparator" type = "Separator"/>
<MenuItem id = "DesignerVerbsBuilder" type="Builder" class = "ICSharpCode.FormDesigner.Commands.DesignerVerbSubmenuBuilder" />
<MenuItem id = "DesignerVerbsBuilder" type="Builder" class = "ICSharpCode.FormsDesigner.Commands.DesignerVerbSubmenuBuilder" />
<MenuItem id = "Cut"
label = "${res:XML.MainMenu.EditMenu.Cut}"
icon = "Icons.16x16.CutIcon"
@ -69,22 +69,22 @@ @@ -69,22 +69,22 @@
<MenuItem id = "ShowProperties"
label = "${res:XML.MainMenu.FormatMenu.ShowProperties}"
icon = "Icons.16x16.Property"
class = "ICSharpCode.FormDesigner.Commands.ShowProperties"/>
class = "ICSharpCode.FormsDesigner.Commands.ShowProperties"/>
</Path>
<Path name = "/SharpDevelop/FormsDesigner/ContextMenus/ContainerMenu">
<MenuItem id = "ViewCode"
label = "${res:SharpDevelop.FormsDesigner.ContextMenus.ViewCodeCommand}"
icon = "Icons.16x16.FormsDesigner.ViewCode"
class = "ICSharpCode.FormDesigner.Commands.ViewCode"/>
class = "ICSharpCode.FormsDesigner.Commands.ViewCode"/>
<MenuItem id = "ViewCodeSeparator" type = "Separator"/>
<MenuItem id = "ViewTabOrder"
label = "${res:XML.MainMenu.FormatMenu.ShowTabOrder}"
class = "ICSharpCode.FormDesigner.Commands.ViewTabOrder"/>
class = "ICSharpCode.FormsDesigner.Commands.ViewTabOrder"/>
<MenuItem id = "Lock"
label = "${res:XML.MainMenu.FormatMenu.Lock}"
icon = "Icons.16x16.FormsDesigner.LockControls"
class = "ICSharpCode.FormDesigner.Commands.LockControls"/>
class = "ICSharpCode.FormsDesigner.Commands.LockControls"/>
<MenuItem id = "LockSeparator" type = "Separator"/>
<MenuItem id = "Paste"
label = "${res:XML.MainMenu.EditMenu.Paste}"
@ -94,16 +94,16 @@ @@ -94,16 +94,16 @@
<MenuItem id = "ShowProperties"
label = "${res:XML.MainMenu.FormatMenu.ShowProperties}"
icon = "Icons.16x16.Property"
class = "ICSharpCode.FormDesigner.Commands.ShowProperties"/>
class = "ICSharpCode.FormsDesigner.Commands.ShowProperties"/>
</Path>
<Path name = "/SharpDevelop/FormsDesigner/ContextMenus/TraySelectionMenu">
<MenuItem id = "ViewCode"
label = "${res:SharpDevelop.FormsDesigner.ContextMenus.ViewCodeCommand}"
icon = "Icons.16x16.FormsDesigner.ViewCode"
class = "ICSharpCode.FormDesigner.Commands.ViewCode"/>
class = "ICSharpCode.FormsDesigner.Commands.ViewCode"/>
<MenuItem id = "ViewCodeSeparator" type = "Separator"/>
<MenuItem id = "DesignerVerbsBuilder" type = "Builder" class = "ICSharpCode.FormDesigner.Commands.DesignerVerbSubmenuBuilder" />
<MenuItem id = "DesignerVerbsBuilder" type = "Builder" class = "ICSharpCode.FormsDesigner.Commands.DesignerVerbSubmenuBuilder" />
<MenuItem id = "Cut"
label = "${res:XML.MainMenu.EditMenu.Cut}"
icon = "Icons.16x16.CutIcon"
@ -124,19 +124,19 @@ @@ -124,19 +124,19 @@
<MenuItem id = "ShowProperties"
label = "${res:XML.MainMenu.FormatMenu.ShowProperties}"
icon = "Icons.16x16.Property"
class = "ICSharpCode.FormDesigner.Commands.ShowProperties"/>
class = "ICSharpCode.FormsDesigner.Commands.ShowProperties"/>
</Path>
<Path name = "/SharpDevelop/FormsDesigner/ContextMenus/ComponentTrayMenu">
<MenuItem id = "ViewCode"
label = "${res:SharpDevelop.FormsDesigner.ContextMenus.ViewCodeCommand}"
icon = "Icons.16x16.FormsDesigner.ViewCode"
class = "ICSharpCode.FormDesigner.Commands.ViewCode"/>
class = "ICSharpCode.FormsDesigner.Commands.ViewCode"/>
<MenuItem id = "ViewCodeSeparator" type = "Separator"/>
<MenuItem id = "Lock"
label = "${res:XML.MainMenu.FormatMenu.Lock}"
icon = "Icons.16x16.FormsDesigner.LockControls"
class = "ICSharpCode.FormDesigner.Commands.LockControls"/>
class = "ICSharpCode.FormsDesigner.Commands.LockControls"/>
<MenuItem id = "LockSeparator" type = "Separator"/>
<MenuItem id = "Paste"
label = "${res:XML.MainMenu.EditMenu.Paste}"
@ -145,14 +145,14 @@ @@ -145,14 +145,14 @@
<MenuItem id = "PasteSeparator" type = "Separator"/>
<MenuItem id = "LineUpIcons"
label = "${res:XML.MainMenu.FormatMenu.LineUpIcons}"
class = "ICSharpCode.FormDesigner.Commands.LineUpIcons"/>
class = "ICSharpCode.FormsDesigner.Commands.LineUpIcons"/>
<MenuItem id = "ShowLargeIcons"
label = "${res:XML.MainMenu.FormatMenu.ShowLargeIcons}"
class = "ICSharpCode.FormDesigner.Commands.ShowLargeIcons"/>
class = "ICSharpCode.FormsDesigner.Commands.ShowLargeIcons"/>
</Path>
<Path name = "/SharpDevelop/Workbench/MainMenu">
<Condition name = "WindowActive" activewindow="ICSharpCode.FormDesigner.FormDesignerViewContent">
<Condition name = "WindowActive" activewindow="ICSharpCode.FormsDesigner.FormsDesignerViewContent">
<MenuItem id = "Format"
label = "${res:XML.MainMenu.FormatMenu}"
insertafter = "Debug"
@ -162,53 +162,53 @@ @@ -162,53 +162,53 @@
<MenuItem id = "AlignHorizontalLeft"
label = "${res:XML.MainMenu.FormatMenu.AlignMenu.AlignHorizontalLeft}"
icon = "Icons.16x16.FormsDesigner.AlignLefts"
class = "ICSharpCode.FormDesigner.Commands.AlignLeft"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignLeft"/>
<!-- The AlingVerticalCenters command is HERE correct!!! -->
<MenuItem id = "AlignHorizontalCenters"
label = "${res:XML.MainMenu.FormatMenu.AlignMenu.AlignHorizontalCenters}"
icon = "Icons.16x16.FormsDesigner.AlignCenters"
class = "ICSharpCode.FormDesigner.Commands.AlignVerticalCenters"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignVerticalCenters"/>
<MenuItem id = "AlignHorizontalRight"
label = "${res:XML.MainMenu.FormatMenu.AlignMenu.AlignHorizontalRight}"
icon = "Icons.16x16.FormsDesigner.AlignRights"
class = "ICSharpCode.FormDesigner.Commands.AlignRight"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignRight"/>
<MenuItem id = "HorizontalSeparator" type = "Separator"/>
<MenuItem id = "AlignTop"
label = "${res:XML.MainMenu.FormatMenu.AlignMenu.AlignTop}"
icon = "Icons.16x16.FormsDesigner.AlignTops"
class = "ICSharpCode.FormDesigner.Commands.AlignTop"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignTop"/>
<!-- The AlignHorizontalCenters command is HERE correct (was swapped internally ?)!!! -->
<MenuItem id = "AlignVerticalCenters"
label = "${res:XML.MainMenu.FormatMenu.AlignMenu.AlignVerticalCenters}"
icon = "Icons.16x16.FormsDesigner.AlignMiddles"
class = "ICSharpCode.FormDesigner.Commands.AlignHorizontalCenters"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignHorizontalCenters"/>
<MenuItem id = "AlignBottom"
label = "${res:XML.MainMenu.FormatMenu.AlignMenu.AlignBottom}"
icon = "Icons.16x16.FormsDesigner.AlignBottoms"
class = "ICSharpCode.FormDesigner.Commands.AlignBottom"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignBottom"/>
<MenuItem id = "VerticalSeparator" type = "Separator"/>
<MenuItem id = "AlignToGrid"
label = "${res:XML.MainMenu.FormatMenu.AlignMenu.AlignToGrid}"
icon = "Icons.16x16.FormsDesigner.AlignToGrid"
class = "ICSharpCode.FormDesigner.Commands.AlignToGrid"/>
class = "ICSharpCode.FormsDesigner.Commands.AlignToGrid"/>
</MenuItem>
<MenuItem id = "SameSizeMenu" label = "${res:XML.MainMenu.FormatMenu.SameSizeMenu}" type = "Menu">
<MenuItem id = "SizeToControlWidth"
label = "${res:XML.MainMenu.FormatMenu.SameSizeMenu.SizeToControlWidth}"
icon = "Icons.16x16.FormsDesigner.MakeSameWidth"
class = "ICSharpCode.FormDesigner.Commands.SizeToControlWidth"/>
class = "ICSharpCode.FormsDesigner.Commands.SizeToControlWidth"/>
<MenuItem id = "SizeToGrid"
label = "${res:XML.MainMenu.FormatMenu.SameSizeMenu.SizeToGrid}"
icon = "Icons.16x16.FormsDesigner.SizeToGrid"
class = "ICSharpCode.FormDesigner.Commands.SizeToGrid"/>
class = "ICSharpCode.FormsDesigner.Commands.SizeToGrid"/>
<MenuItem id = "SizeToControlHeight"
label = "${res:XML.MainMenu.FormatMenu.SameSizeMenu.SizeToControlHeight}"
icon = "Icons.16x16.FormsDesigner.MakeSameHeight"
class = "ICSharpCode.FormDesigner.Commands.SizeToControlHeight"/>
class = "ICSharpCode.FormsDesigner.Commands.SizeToControlHeight"/>
<MenuItem id = "SizeToControl"
label = "${res:XML.MainMenu.FormatMenu.SameSizeMenu.SizeToControl}"
icon = "Icons.16x16.FormsDesigner.MakeSameSize"
class = "ICSharpCode.FormDesigner.Commands.SizeToControl"/>
class = "ICSharpCode.FormsDesigner.Commands.SizeToControl"/>
</MenuItem>
<MenuItem id = "FormatSeparator" type = "Separator"/>
@ -216,37 +216,37 @@ @@ -216,37 +216,37 @@
<MenuItem id = "HorizSpaceMakeEqual"
label = "${res:XML.MainMenu.FormatMenu.HorizontalSpacingMenu.HorizSpaceMakeEqual}"
icon = "Icons.16x16.FormsDesigner.EqualizeHorizontalSpace"
class = "ICSharpCode.FormDesigner.Commands.HorizSpaceMakeEqual"/>
class = "ICSharpCode.FormsDesigner.Commands.HorizSpaceMakeEqual"/>
<MenuItem id = "HorizSpaceIncrease"
label = "${res:XML.MainMenu.FormatMenu.HorizontalSpacingMenu.HorizSpaceIncrease}"
icon = "Icons.16x16.FormsDesigner.IncreaseHorizontalSpace"
class = "ICSharpCode.FormDesigner.Commands.HorizSpaceIncrease"/>
class = "ICSharpCode.FormsDesigner.Commands.HorizSpaceIncrease"/>
<MenuItem id = "HorizSpaceDecrease"
label = "${res:XML.MainMenu.FormatMenu.HorizontalSpacingMenu.HorizSpaceDecrease}"
icon = "Icons.16x16.FormsDesigner.DecreaseHorizontalSpace"
class = "ICSharpCode.FormDesigner.Commands.HorizSpaceDecrease"/>
class = "ICSharpCode.FormsDesigner.Commands.HorizSpaceDecrease"/>
<MenuItem id = "HorizSpaceConcatenate"
label = "${res:XML.MainMenu.FormatMenu.HorizontalSpacingMenu.HorizSpaceConcatenate}"
icon = "Icons.16x16.FormsDesigner.RemoveHorizontalSpace"
class = "ICSharpCode.FormDesigner.Commands.HorizSpaceConcatenate"/>
class = "ICSharpCode.FormsDesigner.Commands.HorizSpaceConcatenate"/>
</MenuItem>
<MenuItem id = "VerticalSpacingMenu" label = "${res:XML.MainMenu.FormatMenu.VerticalSpacingMenu}" type = "Menu">
<MenuItem id = "VertSpaceMakeEqual"
label = "${res:XML.MainMenu.FormatMenu.VerticalSpacingMenu.VertSpaceMakeEqual}"
icon = "Icons.16x16.FormsDesigner.EqualizeVerticalSpace"
class = "ICSharpCode.FormDesigner.Commands.VertSpaceMakeEqual"/>
class = "ICSharpCode.FormsDesigner.Commands.VertSpaceMakeEqual"/>
<MenuItem id = "VertSpaceIncrease"
label = "${res:XML.MainMenu.FormatMenu.VerticalSpacingMenu.VertSpaceIncrease}"
icon = "Icons.16x16.FormsDesigner.IncreaseVerticalSpace"
class = "ICSharpCode.FormDesigner.Commands.VertSpaceIncrease"/>
class = "ICSharpCode.FormsDesigner.Commands.VertSpaceIncrease"/>
<MenuItem id = "VertSpaceDecrease"
label = "${res:XML.MainMenu.FormatMenu.VerticalSpacingMenu.VertSpaceDecrease}"
icon = "Icons.16x16.FormsDesigner.DecreaseVerticalSpace"
class = "ICSharpCode.FormDesigner.Commands.VertSpaceDecrease"/>
class = "ICSharpCode.FormsDesigner.Commands.VertSpaceDecrease"/>
<MenuItem id = "VertSpaceConcatenate"
label = "${res:XML.MainMenu.FormatMenu.VerticalSpacingMenu.VertSpaceConcatenate}"
icon = "Icons.16x16.FormsDesigner.RemoveVerticalSpace"
class = "ICSharpCode.FormDesigner.Commands.VertSpaceConcatenate"/>
class = "ICSharpCode.FormsDesigner.Commands.VertSpaceConcatenate"/>
</MenuItem>
<MenuItem id = "SpacingSeparator" type = "Separator"/>
@ -254,11 +254,11 @@ @@ -254,11 +254,11 @@
<MenuItem id = "CenterHorizontally"
label = "${res:XML.MainMenu.FormatMenu.CenterMenu.CenterHorizontally}"
icon = "Icons.16x16.FormsDesigner.CenterHorizontally"
class = "ICSharpCode.FormDesigner.Commands.CenterHorizontally"/>
class = "ICSharpCode.FormsDesigner.Commands.CenterHorizontally"/>
<MenuItem id = "CenterVertically"
label = "${res:XML.MainMenu.FormatMenu.CenterMenu.CenterVertically}"
icon = "Icons.16x16.FormsDesigner.CenterVertically"
class = "ICSharpCode.FormDesigner.Commands.CenterVertically"/>
class = "ICSharpCode.FormsDesigner.Commands.CenterVertically"/>
</MenuItem>
<MenuItem id = "CenterSeparator" type = "Separator"/>
@ -266,20 +266,20 @@ @@ -266,20 +266,20 @@
<MenuItem id = "BringToFront"
label = "${res:XML.MainMenu.FormatMenu.OrderMenu.BringToFront}"
icon = "Icons.16x16.FormsDesigner.BringToFront"
class = "ICSharpCode.FormDesigner.Commands.BringToFront"/>
class = "ICSharpCode.FormsDesigner.Commands.BringToFront"/>
<MenuItem id = "SendToBack"
label = "${res:XML.MainMenu.FormatMenu.OrderMenu.SendToBack}"
icon = "Icons.16x16.FormsDesigner.SendToBack"
class = "ICSharpCode.FormDesigner.Commands.SendToBack"/>
class = "ICSharpCode.FormsDesigner.Commands.SendToBack"/>
</MenuItem>
<MenuItem id = "OrderSeparator" type = "Separator"/>
<MenuItem id = "ViewTabOrder"
label = "${res:XML.MainMenu.FormatMenu.ShowTabOrder}"
class = "ICSharpCode.FormDesigner.Commands.ViewTabOrder"/>
class = "ICSharpCode.FormsDesigner.Commands.ViewTabOrder"/>
<MenuItem id = "Lock"
label = "${res:XML.MainMenu.FormatMenu.Lock}"
icon = "Icons.16x16.FormsDesigner.LockControls"
class = "ICSharpCode.FormDesigner.Commands.LockControls"/>
class = "ICSharpCode.FormsDesigner.Commands.LockControls"/>
</MenuItem>
</Condition>
</Path>
@ -291,7 +291,7 @@ @@ -291,7 +291,7 @@
<MenuItem id = "CustomizeSideBar"
label = "${res:XML.FormsDesigner.SideBar.CustomizeSidebar}"
icon = "Icons.16x16.Options"
class = "ICSharpCode.FormDesigner.CustomizeSideBar"/>
class = "ICSharpCode.FormsDesigner.CustomizeSideBar"/>
</Path>
<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
@ -301,7 +301,7 @@ @@ -301,7 +301,7 @@
<DialogPanel id = "GridOptions"
label = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.PanelName}"
class = "ICSharpCode.FormDesigner.Gui.OptionPanels.GridOptionsPanel"/>
class = "ICSharpCode.FormsDesigner.Gui.OptionPanels.GridOptionsPanel"/>
</DialogPanel>
</Path>

2
src/AddIns/DisplayBindings/FormDesigner/Project/Resources/AddSidebarComponentsDialog.xfrm

@ -376,4 +376,4 @@ @@ -376,4 +376,4 @@
<Name value="columnHeader" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.GAC.Version}" />
</System.Windows.Forms.ColumnHeader>
</Components>
</Components>

82
src/AddIns/DisplayBindings/FormDesigner/Project/Src/Commands/FormCommands.cs → src/AddIns/DisplayBindings/FormDesigner/Project/Src/Commands/FormsCommands.cs

@ -25,14 +25,12 @@ using ICSharpCode.TextEditor.Document; @@ -25,14 +25,12 @@ using ICSharpCode.TextEditor.Document;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.TextEditor;
using ICSharpCode.FormDesigner;
namespace ICSharpCode.FormDesigner.Commands
namespace ICSharpCode.FormsDesigner.Commands
{
/// <summary>
/// This is the base class for all designer menu commands
/// </summary>
public abstract class AbstractFormDesignerCommand : AbstractMenuCommand
public abstract class AbstractFormsDesignerCommand : AbstractMenuCommand
{
public abstract CommandID CommandID {
get;
@ -43,20 +41,20 @@ namespace ICSharpCode.FormDesigner.Commands @@ -43,20 +41,20 @@ namespace ICSharpCode.FormDesigner.Commands
return true;
}
FormDesignerViewContent FormDesigner {
FormsDesignerViewContent FormDesigner {
get {
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window == null) {
return null;
}
return window.ActiveViewContent as FormDesignerViewContent;
return window.ActiveViewContent as FormsDesignerViewContent;
}
}
public override void Run()
{
try {
FormDesignerViewContent formDesigner = FormDesigner;
FormsDesignerViewContent formDesigner = FormDesigner;
if (formDesigner != null && CanExecuteCommand(formDesigner.Host)) {
IMenuCommandService menuCommandService = (IMenuCommandService)formDesigner.Host.GetService(typeof(IMenuCommandService));
menuCommandService.GlobalInvoke(CommandID);
@ -69,13 +67,13 @@ namespace ICSharpCode.FormDesigner.Commands @@ -69,13 +67,13 @@ namespace ICSharpCode.FormDesigner.Commands
public class ViewCode : AbstractMenuCommand
{
FormDesignerViewContent FormDesigner {
FormsDesignerViewContent FormDesigner {
get {
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window == null) {
return null;
}
return window.ActiveViewContent as FormDesignerViewContent;
return window.ActiveViewContent as FormsDesignerViewContent;
}
}
public override void Run()
@ -85,7 +83,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -85,7 +83,7 @@ namespace ICSharpCode.FormDesigner.Commands
return;
}
FormDesignerViewContent formDesigner = FormDesigner;
FormsDesignerViewContent formDesigner = FormDesigner;
if (formDesigner != null) {
formDesigner.ShowSourceCode();
@ -149,7 +147,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -149,7 +147,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
#region Align Commands
public class AlignToGrid : AbstractFormDesignerCommand
public class AlignToGrid : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -158,7 +156,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -158,7 +156,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class AlignLeft : AbstractFormDesignerCommand
public class AlignLeft : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -167,7 +165,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -167,7 +165,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class AlignRight : AbstractFormDesignerCommand
public class AlignRight : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -176,7 +174,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -176,7 +174,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class AlignTop : AbstractFormDesignerCommand
public class AlignTop : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -185,7 +183,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -185,7 +183,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class AlignBottom : AbstractFormDesignerCommand
public class AlignBottom : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -194,7 +192,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -194,7 +192,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class AlignHorizontalCenters : AbstractFormDesignerCommand
public class AlignHorizontalCenters : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -203,7 +201,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -203,7 +201,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class AlignVerticalCenters : AbstractFormDesignerCommand
public class AlignVerticalCenters : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -214,7 +212,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -214,7 +212,7 @@ namespace ICSharpCode.FormDesigner.Commands
#endregion
#region Make Same Size Commands
public class SizeToGrid : AbstractFormDesignerCommand
public class SizeToGrid : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -223,7 +221,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -223,7 +221,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class SizeToControl : AbstractFormDesignerCommand
public class SizeToControl : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -232,7 +230,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -232,7 +230,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class SizeToControlHeight : AbstractFormDesignerCommand
public class SizeToControlHeight : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -241,7 +239,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -241,7 +239,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class SizeToControlWidth : AbstractFormDesignerCommand
public class SizeToControlWidth : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -252,7 +250,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -252,7 +250,7 @@ namespace ICSharpCode.FormDesigner.Commands
#endregion
#region Horizontal Spacing Commands
public class HorizSpaceMakeEqual : AbstractFormDesignerCommand
public class HorizSpaceMakeEqual : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -267,7 +265,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -267,7 +265,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class HorizSpaceIncrease : AbstractFormDesignerCommand
public class HorizSpaceIncrease : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -276,7 +274,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -276,7 +274,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class HorizSpaceDecrease : AbstractFormDesignerCommand
public class HorizSpaceDecrease : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -285,7 +283,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -285,7 +283,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class HorizSpaceConcatenate : AbstractFormDesignerCommand
public class HorizSpaceConcatenate : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -296,7 +294,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -296,7 +294,7 @@ namespace ICSharpCode.FormDesigner.Commands
#endregion
#region Vertical Spacing Commands
public class VertSpaceMakeEqual : AbstractFormDesignerCommand
public class VertSpaceMakeEqual : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -312,7 +310,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -312,7 +310,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
public class VertSpaceIncrease : AbstractFormDesignerCommand
public class VertSpaceIncrease : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -321,7 +319,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -321,7 +319,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class VertSpaceDecrease : AbstractFormDesignerCommand
public class VertSpaceDecrease : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -330,7 +328,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -330,7 +328,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class VertSpaceConcatenate : AbstractFormDesignerCommand
public class VertSpaceConcatenate : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -341,7 +339,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -341,7 +339,7 @@ namespace ICSharpCode.FormDesigner.Commands
#endregion
#region Center Commands
public class CenterHorizontally : AbstractFormDesignerCommand
public class CenterHorizontally : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -349,7 +347,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -349,7 +347,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
}
public class CenterVertically : AbstractFormDesignerCommand
public class CenterVertically : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -360,7 +358,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -360,7 +358,7 @@ namespace ICSharpCode.FormDesigner.Commands
#endregion
#region Order Commands
public class SendToBack : AbstractFormDesignerCommand
public class SendToBack : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -369,7 +367,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -369,7 +367,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
}
public class BringToFront : AbstractFormDesignerCommand
public class BringToFront : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -381,7 +379,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -381,7 +379,7 @@ namespace ICSharpCode.FormDesigner.Commands
#region Tray Commands
public class LineUpIcons : AbstractFormDesignerCommand
public class LineUpIcons : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -392,13 +390,13 @@ namespace ICSharpCode.FormDesigner.Commands @@ -392,13 +390,13 @@ namespace ICSharpCode.FormDesigner.Commands
public class ShowLargeIcons : AbstractCheckableMenuCommand
{
FormDesignerViewContent FormDesigner {
FormsDesignerViewContent FormDesigner {
get {
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window == null) {
return null;
}
return window.ActiveViewContent as FormDesignerViewContent;
return window.ActiveViewContent as FormsDesignerViewContent;
}
}
public override bool IsChecked {
@ -418,7 +416,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -418,7 +416,7 @@ namespace ICSharpCode.FormDesigner.Commands
}
ComponentTray Tray {
get {
FormDesignerViewContent formDesigner = FormDesigner;
FormsDesignerViewContent formDesigner = FormDesigner;
if (formDesigner != null) {
return formDesigner.Host.GetService(typeof(ComponentTray)) as ComponentTray;
}
@ -433,7 +431,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -433,7 +431,7 @@ namespace ICSharpCode.FormDesigner.Commands
#endregion
#region Global Commands
public class LockControls : AbstractFormDesignerCommand
public class LockControls : AbstractFormsDesignerCommand
{
public override CommandID CommandID {
get {
@ -454,7 +452,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -454,7 +452,7 @@ namespace ICSharpCode.FormDesigner.Commands
return false;
}
FormDesignerViewContent formDesigner = FormDesigner;
FormsDesignerViewContent formDesigner = FormDesigner;
if (formDesigner != null) {
return formDesigner.IsTabOrderMode;
}
@ -464,13 +462,13 @@ namespace ICSharpCode.FormDesigner.Commands @@ -464,13 +462,13 @@ namespace ICSharpCode.FormDesigner.Commands
SetTabOrder(value);
}
}
FormDesignerViewContent FormDesigner {
FormsDesignerViewContent FormDesigner {
get {
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window == null) {
return null;
}
return window.ActiveViewContent as FormDesignerViewContent;
return window.ActiveViewContent as FormsDesignerViewContent;
}
}
@ -481,7 +479,7 @@ namespace ICSharpCode.FormDesigner.Commands @@ -481,7 +479,7 @@ namespace ICSharpCode.FormDesigner.Commands
return;
}
FormDesignerViewContent formDesigner = FormDesigner;
FormsDesignerViewContent formDesigner = FormDesigner;
if (formDesigner != null) {
if (show) {
formDesigner.ShowTabOrder();

6
src/AddIns/DisplayBindings/FormDesigner/Project/Src/Commands/SideBarCommands.cs

@ -24,8 +24,8 @@ using ICSharpCode.SharpDevelop; @@ -24,8 +24,8 @@ using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Internal.Undo;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormDesigner.Gui;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.FormsDesigner.Gui;
using ICSharpCode.Core;
using System.CodeDom;
@ -34,7 +34,7 @@ using System.CodeDom.Compiler; @@ -34,7 +34,7 @@ using System.CodeDom.Compiler;
using Microsoft.CSharp;
using Microsoft.VisualBasic;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class CustomizeSideBar : AbstractMenuCommand
{

10
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/AbstractDesignerGenerator.cs

@ -24,14 +24,14 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; @@ -24,14 +24,14 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.Core;
using ICSharpCode.TextEditor.Document;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public abstract class AbstractDesignerGenerator : IDesignerGenerator
{
IClass c;
IMethod initializeComponents;
FormDesignerViewContent viewContent;
FormsDesignerViewContent viewContent;
bool failedDesignerInitialize = false;
CodeDomProvider provider;
@ -45,7 +45,7 @@ namespace ICSharpCode.FormDesigner @@ -45,7 +45,7 @@ namespace ICSharpCode.FormDesigner
}
}
public void Attach(FormDesignerViewContent viewContent)
public void Attach(FormsDesignerViewContent viewContent)
{
this.viewContent = viewContent;
}
@ -248,8 +248,8 @@ namespace ICSharpCode.FormDesigner @@ -248,8 +248,8 @@ namespace ICSharpCode.FormDesigner
ParseInformation info = ParserService.ParseFile(viewContent.TextEditorControl.FileName, content, false, true);
ICompilationUnit cu = (ICompilationUnit)info.BestCompilationUnit;
foreach (IClass c in cu.Classes) {
if (FormDesignerSecondaryDisplayBinding.BaseClassIsFormOrControl(c)) {
initializeComponents = FormDesignerSecondaryDisplayBinding.GetInitializeComponents(c);
if (FormsDesignerSecondaryDisplayBinding.BaseClassIsFormOrControl(c)) {
initializeComponents = FormsDesignerSecondaryDisplayBinding.GetInitializeComponents(c);
if (initializeComponents != null) {
string designerFile = initializeComponents.DeclaringType.CompilationUnit.FileName;
string designerContent;

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CSharpDesignerGenerator.cs

@ -13,7 +13,7 @@ using System.Text; @@ -13,7 +13,7 @@ using System.Text;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Dom;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class CSharpDesignerGenerator : AbstractDesignerGenerator
{

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/CodeDOMGenerator.cs

@ -24,9 +24,9 @@ using System.CodeDom; @@ -24,9 +24,9 @@ using System.CodeDom;
using System.CodeDom.Compiler;
using ICSharpCode.Core;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
/// <summary>
/// This class is able to generate a CodeDOM definition out of a XML file.

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/IDesignerGenerator.cs

@ -14,14 +14,14 @@ using System.CodeDom.Compiler; @@ -14,14 +14,14 @@ using System.CodeDom.Compiler;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public interface IDesignerGenerator
{
CodeDomProvider CodeDomProvider {
get;
}
void Attach(FormDesignerViewContent viewContent);
void Attach(FormsDesignerViewContent viewContent);
void Detach();
void MergeFormChanges(CodeCompileUnit unit);
bool InsertComponentEvent(IComponent component, EventDescriptor edesc, string eventMethodName, string body, out int position);

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/VBNetDesignerGenerator.cs

@ -12,7 +12,7 @@ using System.Reflection; @@ -12,7 +12,7 @@ using System.Reflection;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Dom;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class VBNetDesignerGenerator : AbstractDesignerGenerator
{

6
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/XmlDesignerGenerator.cs

@ -19,11 +19,11 @@ using System.CodeDom.Compiler; @@ -19,11 +19,11 @@ using System.CodeDom.Compiler;
using System.Text;
using System.Text.RegularExpressions;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class XmlDesignerGenerator : IDesignerGenerator
{
FormDesignerViewContent viewContent;
FormsDesignerViewContent viewContent;
public CodeDomProvider CodeDomProvider {
get {
@ -31,7 +31,7 @@ namespace ICSharpCode.FormDesigner @@ -31,7 +31,7 @@ namespace ICSharpCode.FormDesigner
}
}
public void Attach(FormDesignerViewContent viewContent)
public void Attach(FormsDesignerViewContent viewContent)
{
this.viewContent = viewContent;
}

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/DesignerLoaderProvider.cs

@ -10,7 +10,7 @@ using System.ComponentModel.Design.Serialization; @@ -10,7 +10,7 @@ using System.ComponentModel.Design.Serialization;
using ICSharpCode.TextEditor;
using ICSharpCode.NRefactory.Parser;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public interface IDesignerLoaderProvider
{

32
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/FormDesignerLoadException.cs

@ -1,32 +0,0 @@ @@ -1,32 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Runtime.Serialization;
namespace ICSharpCode.FormDesigner
{
[Serializable()]
public class FormDesignerLoadException : ApplicationException
{
public FormDesignerLoadException() : base()
{
}
public FormDesignerLoadException(string message) : base(message)
{
}
public FormDesignerLoadException(string message, Exception innerException) : base(message, innerException)
{
}
protected FormDesignerLoadException(SerializationInfo info, StreamingContext context) : base(info, context)
{
}
}
}

32
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/FormsDesignerLoadException.cs

@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
// <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Runtime.Serialization;
namespace ICSharpCode.FormsDesigner
{
[Serializable()]
public class FormsDesignerLoadException : ApplicationException
{
public FormsDesignerLoadException() : base()
{
}
public FormsDesignerLoadException(string message) : base(message)
{
}
public FormsDesignerLoadException(string message, Exception innerException) : base(message, innerException)
{
}
protected FormsDesignerLoadException(SerializationInfo info, StreamingContext context) : base(info, context)
{
}
}
}

12
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/NRefactoryDesignerLoader.cs

@ -22,12 +22,12 @@ using ICSharpCode.TextEditor; @@ -22,12 +22,12 @@ using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Document;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.NRefactory.Parser;
using ICSharpCode.NRefactory.Parser.AST;
using ICSharpCode.NRefactory.PrettyPrinter;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class DefaultMemberRelationshipService : MemberRelationshipService
{
@ -148,13 +148,13 @@ namespace ICSharpCode.FormDesigner @@ -148,13 +148,13 @@ namespace ICSharpCode.FormDesigner
IClass formClass = null;
foreach (IClass c in parseInfo.BestCompilationUnit.Classes) {
if (FormDesignerSecondaryDisplayBinding.BaseClassIsFormOrControl(c)) {
if (FormsDesignerSecondaryDisplayBinding.BaseClassIsFormOrControl(c)) {
formClass = c;
break;
}
}
if (formClass == null)
throw new FormDesignerLoadException("No class derived from Form or Control was found.");
throw new FormsDesignerLoadException("No class derived from Form or Control was found.");
// Initialize designer for formClass
formClass = formClass.DefaultReturnType.GetUnderlyingClass();
@ -184,7 +184,7 @@ namespace ICSharpCode.FormDesigner @@ -184,7 +184,7 @@ namespace ICSharpCode.FormDesigner
ICSharpCode.NRefactory.Parser.IParser p = ICSharpCode.NRefactory.Parser.ParserFactory.CreateParser(language, new StringReader(fileContent));
p.Parse();
if (p.Errors.count > 0) {
throw new FormDesignerLoadException("Syntax errors in " + fileName + ":\r\n" + p.Errors.ErrorOutput);
throw new FormsDesignerLoadException("Syntax errors in " + fileName + ":\r\n" + p.Errors.ErrorOutput);
}
// Try to fix the type names to fully qualified ones
@ -193,7 +193,7 @@ namespace ICSharpCode.FormDesigner @@ -193,7 +193,7 @@ namespace ICSharpCode.FormDesigner
}
if (!foundInitMethod)
throw new FormDesignerLoadException("The InitializeComponent method was not found. Designer cannot be loaded.");
throw new FormsDesignerLoadException("The InitializeComponent method was not found. Designer cannot be loaded.");
CompilationUnit combinedCu = new CompilationUnit();
NamespaceDeclaration nsDecl = new NamespaceDeclaration(formClass.Namespace);

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerLoader/XmlDesignerLoader.cs

@ -27,13 +27,13 @@ using System.Xml; @@ -27,13 +27,13 @@ using System.Xml;
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Document;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.NRefactory.Parser;
using ICSharpCode.NRefactory.Parser.AST;
using ICSharpCode.NRefactory.PrettyPrinter;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class XmlDesignerLoader : BasicDesignerLoader, IObjectCreator

36
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerViewContent.cs → src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerViewContent.cs

@ -29,8 +29,8 @@ using ICSharpCode.SharpDevelop.Internal.Undo; @@ -29,8 +29,8 @@ using ICSharpCode.SharpDevelop.Internal.Undo;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.Core;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormDesigner.FormDesigner.UndoRedo;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.FormsDesigner.UndoRedo;
using ICSharpCode.TextEditor;
using ICSharpCode.TextEditor.Document;
@ -44,9 +44,9 @@ using System.CodeDom.Compiler; @@ -44,9 +44,9 @@ using System.CodeDom.Compiler;
using Microsoft.CSharp;
using Microsoft.VisualBasic;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class FormDesignerViewContent : AbstractSecondaryViewContent, IClipboardHandler, IUndoHandler, IHasPropertyContainer, IContextHelpProvider
public class FormsDesignerViewContent : AbstractSecondaryViewContent, IClipboardHandler, IUndoHandler, IHasPropertyContainer, IContextHelpProvider
{
protected bool failedDesignerInitialize;
@ -61,7 +61,7 @@ namespace ICSharpCode.FormDesigner @@ -61,7 +61,7 @@ namespace ICSharpCode.FormDesigner
IDesignerLoaderProvider loaderProvider;
IDesignerGenerator generator;
DesignerResourceService designerResourceService;
FormDesignerUndoEngine undoEngine;
FormsDesignerUndoEngine undoEngine;
public override Control Control {
get {
@ -99,7 +99,7 @@ namespace ICSharpCode.FormDesigner @@ -99,7 +99,7 @@ namespace ICSharpCode.FormDesigner
return (IDesignerHost)designSurface.GetService(typeof(IDesignerHost));
}
}
public FormDesignerViewContent(IViewContent viewContent, IDesignerLoaderProvider loaderProvider, IDesignerGenerator generator)
public FormsDesignerViewContent(IViewContent viewContent, IDesignerLoaderProvider loaderProvider, IDesignerGenerator generator)
{
if (!FormKeyHandler.inserted) {
FormKeyHandler.Insert();
@ -116,7 +116,7 @@ namespace ICSharpCode.FormDesigner @@ -116,7 +116,7 @@ namespace ICSharpCode.FormDesigner
public override void SwitchedTo()
{
if (IsFormDesignerVisible) {
if (IsFormsDesignerVisible) {
AddSideBars();
}
}
@ -138,14 +138,14 @@ namespace ICSharpCode.FormDesigner @@ -138,14 +138,14 @@ namespace ICSharpCode.FormDesigner
serviceContainer.AddService(typeof(AmbientProperties), ambientProperties);
serviceContainer.AddService(typeof(ITypeResolutionService), ToolboxProvider.TypeResolutionService);
serviceContainer.AddService(typeof(System.ComponentModel.Design.IDesignerEventService), new DesignerEventService());
serviceContainer.AddService(typeof(System.ComponentModel.Design.DesignerOptionService), new ICSharpCode.FormDesigner.Services.DesignerOptionService());
serviceContainer.AddService(typeof(System.ComponentModel.Design.DesignerOptionService), new ICSharpCode.FormsDesigner.Services.DesignerOptionService());
serviceContainer.AddService(typeof(ITypeDiscoveryService), new TypeDiscoveryService());
serviceContainer.AddService(typeof(MemberRelationshipService), new DefaultMemberRelationshipService());
designSurface = new DesignSurface(serviceContainer);
serviceContainer.AddService(typeof(System.ComponentModel.Design.IMenuCommandService), new ICSharpCode.FormDesigner.Services.MenuCommandService(p, designSurface, serviceContainer));
ICSharpCode.FormDesigner.Services.EventBindingService eventBindingService = new ICSharpCode.FormDesigner.Services.EventBindingService(designSurface);
serviceContainer.AddService(typeof(System.ComponentModel.Design.IMenuCommandService), new ICSharpCode.FormsDesigner.Services.MenuCommandService(p, designSurface, serviceContainer));
ICSharpCode.FormsDesigner.Services.EventBindingService eventBindingService = new ICSharpCode.FormsDesigner.Services.EventBindingService(designSurface);
serviceContainer.AddService(typeof(System.ComponentModel.Design.IEventBindingService), eventBindingService);
designerResourceService.Host = Host;
@ -156,7 +156,7 @@ namespace ICSharpCode.FormDesigner @@ -156,7 +156,7 @@ namespace ICSharpCode.FormDesigner
generator.Attach(this);
undoEngine = new FormDesignerUndoEngine(Host);
undoEngine = new FormsDesignerUndoEngine(Host);
IComponentChangeService componentChangeService = (IComponentChangeService)designSurface.GetService(typeof(IComponentChangeService));
componentChangeService.ComponentChanged += delegate { viewContent.IsDirty = true; };
@ -215,9 +215,9 @@ namespace ICSharpCode.FormDesigner @@ -215,9 +215,9 @@ namespace ICSharpCode.FormDesigner
failedDesignerInitialize = true;
TextBox errorText = new TextBox();
errorText.Multiline = true;
if (e.InnerException is FormDesignerLoadException)
if (e.InnerException is FormsDesignerLoadException)
errorText.Text = e.InnerException.Message;
else if (e is FormDesignerLoadException)
else if (e is FormsDesignerLoadException)
errorText.Text = e.Message;
else
errorText.Text = e.ToString();
@ -287,7 +287,7 @@ namespace ICSharpCode.FormDesigner @@ -287,7 +287,7 @@ namespace ICSharpCode.FormDesigner
{
PropertyPad.PropertyValueChanged += PropertyValueChanged;
Reload();
IsFormDesignerVisible = true;
IsFormsDesignerVisible = true;
AddSideBars();
propertyContainer.Host = Host;
UpdateSelectableObjects();
@ -296,7 +296,7 @@ namespace ICSharpCode.FormDesigner @@ -296,7 +296,7 @@ namespace ICSharpCode.FormDesigner
public override void Dispose()
{
disposing = true;
if (IsFormDesignerVisible) {
if (IsFormsDesignerVisible) {
Deselected();
}
base.Dispose();
@ -307,7 +307,7 @@ namespace ICSharpCode.FormDesigner @@ -307,7 +307,7 @@ namespace ICSharpCode.FormDesigner
LoggingService.Info("Deselected form designer, unloading...");
PropertyPad.PropertyValueChanged -= PropertyValueChanged;
propertyContainer.Clear();
IsFormDesignerVisible = false;
IsFormsDesignerVisible = false;
foreach(AxSideTab tab in ToolboxProvider.SideTabs) {
if (!SharpDevelopSideBar.SideBar.Tabs.Contains(tab)) {
return;
@ -326,7 +326,7 @@ namespace ICSharpCode.FormDesigner @@ -326,7 +326,7 @@ namespace ICSharpCode.FormDesigner
public override void NotifyBeforeSave()
{
base.NotifyBeforeSave();
if (IsFormDesignerVisible)
if (IsFormsDesignerVisible)
MergeFormChanges();
}
@ -348,7 +348,7 @@ namespace ICSharpCode.FormDesigner @@ -348,7 +348,7 @@ namespace ICSharpCode.FormDesigner
}
}
public bool IsFormDesignerVisible = false;
public bool IsFormsDesignerVisible = false;
#region IUndoHandler implementation
public bool EnableUndo {

8
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormKeyHandler.cs

@ -26,7 +26,7 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; @@ -26,7 +26,7 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.Core;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
using System.CodeDom;
using System.CodeDom.Compiler;
@ -34,7 +34,7 @@ using System.CodeDom.Compiler; @@ -34,7 +34,7 @@ using System.CodeDom.Compiler;
using Microsoft.CSharp;
using Microsoft.VisualBasic;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class FormKeyHandler : IMessageFilter
{
@ -93,13 +93,13 @@ namespace ICSharpCode.FormDesigner @@ -93,13 +93,13 @@ namespace ICSharpCode.FormDesigner
return false;
}
FormDesignerViewContent formDesigner = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ActiveViewContent as FormDesignerViewContent;
FormsDesignerViewContent formDesigner = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ActiveViewContent as FormsDesignerViewContent;
if (formDesigner == null) {
return false;
}
if (!formDesigner.IsFormDesignerVisible) {
if (!formDesigner.IsFormsDesignerVisible) {
return false;
}

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/AddComponentsDialog.cs

@ -20,7 +20,7 @@ using MSjogren.GacTool.FusionNative; @@ -20,7 +20,7 @@ using MSjogren.GacTool.FusionNative;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace ICSharpCode.FormDesigner.Gui
namespace ICSharpCode.FormsDesigner.Gui
{
public class AddComponentsDialog : BaseSharpDevelopForm
{
@ -34,7 +34,7 @@ namespace ICSharpCode.FormDesigner.Gui @@ -34,7 +34,7 @@ namespace ICSharpCode.FormDesigner.Gui
public AddComponentsDialog()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormDesigner.Resources.AddSidebarComponentsDialog.xfrm"));
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormsDesigner.Resources.AddSidebarComponentsDialog.xfrm"));
Icon = null;
PrintGACCache();

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ComponentLibraryLoader.cs

@ -12,7 +12,7 @@ using System.Reflection; @@ -12,7 +12,7 @@ using System.Reflection;
using System.Collections;
using System.Xml;
namespace ICSharpCode.FormDesigner.Gui
namespace ICSharpCode.FormsDesigner.Gui
{
public class ToolComponent
{

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ConfigureSideBarDialog.cs

@ -13,7 +13,7 @@ using System.Windows.Forms; @@ -13,7 +13,7 @@ using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace ICSharpCode.FormDesigner.Gui
namespace ICSharpCode.FormsDesigner.Gui
{
public class ConfigureSideBarDialog : BaseSharpDevelopForm
{
@ -21,7 +21,7 @@ namespace ICSharpCode.FormDesigner.Gui @@ -21,7 +21,7 @@ namespace ICSharpCode.FormDesigner.Gui
public ConfigureSideBarDialog()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormDesigner.Resources.ConfigureSidebarDialog.xfrm"));
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormsDesigner.Resources.ConfigureSidebarDialog.xfrm"));
oldComponents = ToolboxProvider.ComponentLibraryLoader.CopyCategories();

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/CustomComponentsSideTab.cs

@ -26,9 +26,9 @@ using System.Threading; @@ -26,9 +26,9 @@ using System.Threading;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
namespace ICSharpCode.FormDesigner.Gui
namespace ICSharpCode.FormsDesigner.Gui
{
public class CustomComponentsSideTab : SideTabDesigner
{

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/OptionPanels/GridOptions.cs

@ -17,13 +17,13 @@ using ICSharpCode.SharpDevelop.Project; @@ -17,13 +17,13 @@ using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormDesigner.Gui.OptionPanels
namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
{
public class GridOptionsPanel : AbstractOptionPanel
{
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormDesigner.Resources.WindowsFormsGridOptions.xfrm"));
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormsDesigner.Resources.WindowsFormsGridOptions.xfrm"));
ControlDictionary["widthTextBox"].Text = PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeWidth", 8).ToString();
ControlDictionary["heightTextBox"].Text = PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeHeight", 8).ToString();

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/RenameCategoryDialog.cs

@ -12,7 +12,7 @@ using ICSharpCode.SharpDevelop.Gui; @@ -12,7 +12,7 @@ using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace ICSharpCode.FormDesigner.Gui
namespace ICSharpCode.FormsDesigner.Gui
{
public class RenameCategoryDialog : BaseSharpDevelopForm
{
@ -26,7 +26,7 @@ namespace ICSharpCode.FormDesigner.Gui @@ -26,7 +26,7 @@ namespace ICSharpCode.FormDesigner.Gui
public RenameCategoryDialog(string categoryName, Form owner)
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormDesigner.Resources.RenameSidebarCategoryDialog.xfrm"));
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormsDesigner.Resources.RenameSidebarCategoryDialog.xfrm"));
this.Owner = owner;

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ShowTabOrder/ITabOrder.cs

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
using System;
using System.Drawing;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
/// <summary>
/// Interface defining the tab order mode.ning the tab order mode.

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/ShowTabOrder/TabIndexControl.cs

@ -14,9 +14,9 @@ using System.ComponentModel; @@ -14,9 +14,9 @@ using System.ComponentModel;
using System.ComponentModel.Design;
using System.Windows.Forms;
using System.Windows.Forms.Design;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
/// <summary>
/// This class represents a visual feedback for the current tab index of a

20
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/SideTabDesigner.cs

@ -5,22 +5,6 @@ @@ -5,22 +5,6 @@
// <version>$Revision$</version>
// </file>
/*
* Module : FormDesigner
*
* Project : FormDesigner Loading Library Control.
*
* Source code altering : A1
*
* Description : Creation of the SideTabDesigner which load controls from an assembly
* Use for FromDesigner.
*
* Denis ERCHOFF 22/01/2003
*/
// Denis ERCHOFF 22/01/2003 BEGIN A1
using System;
using System.IO;
using System.Windows.Forms;
@ -32,10 +16,10 @@ using System.ComponentModel; @@ -32,10 +16,10 @@ using System.ComponentModel;
using System.ComponentModel.Design;
using ICSharpCode.Core;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormDesigner.Gui
namespace ICSharpCode.FormsDesigner.Gui
{
public class SideTabDesigner : AxSideTab
{

4
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Gui/SideTabItemDesigner.cs

@ -28,10 +28,10 @@ using System.Drawing; @@ -28,10 +28,10 @@ using System.Drawing;
using System.ComponentModel.Design;
using ICSharpCode.Core;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormDesigner.Gui
namespace ICSharpCode.FormsDesigner.Gui
{
public class SideTabItemDesigner : SharpDevelopSideTabItem
{

641
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/AbstractMenuEditorControl.cs

@ -1,641 +0,0 @@ @@ -1,641 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.Diagnostics;
//using System.Drawing;
//using System.Drawing.Drawing2D;
//using System.Collections;
//using System.ComponentModel;
//using System.ComponentModel.Design;
//using System.Windows.Forms;
//using System.Windows.Forms.Design;
//using ICSharpCode.FormDesigner.Services;
//
//using System.Drawing.Design;
//
//namespace ICSharpCode.FormDesigner {
//
// public enum ItemSelection {
// Last,
// First,
// Next,
// Prev
// }
//
// public abstract class AbstractMenuEditorControl : Panel
// {
// protected Menu menu;
// protected SizeF[] menuItemSize;
// protected RectangleF[] menuItemAreas;
//
// protected RectangleF typeArea;
// protected SizeF typeSize;
// protected string typeAreaText = "Type here";
//
// protected IDesignerHost host;
// protected ItemEditor itemEditor = null;
//
// protected Control rootControl;
// protected SubMenuEditorControl subMenuEditor = null;
//
// protected int oldSelectedItem = -1;
// protected int selectedItem = -1;
// protected int mouseOverItem = -1;
// protected bool isMouseOverLeftSpacing = false;
//
// protected bool isHorizontal = true;
// protected bool canEditMenuItems = true;
// protected bool drawMenuGlyphs = false;
// protected Size borderSize = new Size(0, 0);
//
// public static bool MenuEditorFocused = false;
// public bool iveTheFocus;
//
// public int SelectedItem {
// get {
// return this.selectedItem;
// }
// set {
// this.oldSelectedItem = selectedItem;
// if (selectedItem != value) {
// selectedItem = value;
// Refresh();
// }
// ISelectionService selectionService = (ISelectionService)host.GetService(typeof(ISelectionService));
// if (menu != null && selectedItem >= 0 && selectedItem < menu.MenuItems.Count) {
// selectionService.SetSelectedComponents(new object[] { menu.MenuItems[selectedItem] });
// } else {
// selectionService.SetSelectedComponents(null);
// }
// }
// }
//
// protected override void OnGotFocus(EventArgs e)
// {
// base.OnGotFocus(e);
// MenuEditorFocused = true;
// iveTheFocus = true;
// Refresh();
// }
//
// protected override void OnLostFocus(EventArgs e)
// {
// base.OnLostFocus(e);
// iveTheFocus = false;
//// SelectedItem = -1;
// Refresh();
// }
//
// protected override Size DefaultSize {
// get {
// return new Size(320, System.Windows.Forms.SystemInformation.MenuHeight + 2);
// }
// }
//
// protected AbstractMenuEditorControl(IDesignerHost host, Menu menu)
// {
// this.host = host;
// this.menu = menu;
// rootControl = (Control)host.RootComponent;
// rootControl.Resize += new EventHandler(SetSize);
// SetSize(null, null);
// this.SetStyle(ControlStyles.OptimizedDoubleBuffer | ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
// }
//
// public virtual void SetSize(object sender, EventArgs e)
// {
// int boundsLeftRightOffset = 0;
// int boundsTopOffset = 0;
//
// if (rootControl is Form) {
// Form f = (Form)rootControl;
// switch (f.FormBorderStyle) {
// case FormBorderStyle.Fixed3D:
// boundsLeftRightOffset = SystemInformation.Border3DSize.Width + SystemInformation.FixedFrameBorderSize.Width;
// break;
//
// case FormBorderStyle.FixedDialog:
// case FormBorderStyle.FixedSingle:
// case FormBorderStyle.FixedToolWindow:
// boundsLeftRightOffset = SystemInformation.FixedFrameBorderSize.Width;
// break;
//
// case FormBorderStyle.Sizable:
// case FormBorderStyle.SizableToolWindow:
// boundsLeftRightOffset = SystemInformation.FrameBorderSize.Width;
// break;
// }
//
// switch (f.FormBorderStyle) {
// case FormBorderStyle.Fixed3D:
// case FormBorderStyle.FixedDialog:
// case FormBorderStyle.FixedSingle:
// boundsTopOffset = SystemInformation.FixedFrameBorderSize.Height + SystemInformation.CaptionHeight;
// break;
//
// case FormBorderStyle.Sizable:
// boundsTopOffset = SystemInformation.FrameBorderSize.Height + SystemInformation.CaptionHeight;
// break;
//
// case FormBorderStyle.SizableToolWindow:
// boundsTopOffset = SystemInformation.FrameBorderSize.Height + SystemInformation.ToolWindowCaptionHeight;
// break;
// case FormBorderStyle.FixedToolWindow:
// boundsTopOffset = SystemInformation.FixedFrameBorderSize.Height + SystemInformation.ToolWindowCaptionHeight;
// break;
// }
// }
//
// SetBounds(rootControl.Bounds.Left + boundsLeftRightOffset,
// rootControl.Bounds.Top + boundsTopOffset,
// rootControl.Bounds.Width - boundsLeftRightOffset * 2,
// System.Windows.Forms.SystemInformation.MenuHeight + 2);
// Show();
// }
//
// protected override void OnPaintBackground(System.Windows.Forms.PaintEventArgs pevent)
// {
// Graphics g = pevent.Graphics;
// g.FillRectangle(new SolidBrush(SystemColors.Menu),
// pevent.ClipRectangle.X,
// pevent.ClipRectangle.Y,
// pevent.ClipRectangle.Width,
// pevent.ClipRectangle.Height);
// }
//
// int GetLeftSpacing()
// {
// return drawMenuGlyphs ? SystemInformation.MenuHeight : 0;
// }
// int GetRightSpacing()
// {
// return drawMenuGlyphs ? SystemInformation.MenuHeight : 0;
// }
// int GetLeftRightSpacing()
// {
// return GetLeftSpacing() + GetRightSpacing();
// }
//
// protected virtual void MeasureMenuItems()
// {
// Graphics g = null;
// try {
// g = base.CreateGraphics();
// } catch (Exception e) {
// Console.WriteLine("Got exception : " + e.ToString());
// return;
// }
//
// Font f = System.Windows.Forms.SystemInformation.MenuFont;
//
// menuItemAreas = new RectangleF[menu.MenuItems.Count];
//
// float curX = 0;
// float curY = 0;
// float maxWidth = 0;
// menuItemSize = new SizeF[menu.MenuItems.Count];
// for (int i = 0; i < menu.MenuItems.Count; ++i) {
// menuItemSize[i] = g.MeasureString(menu.MenuItems[i].Text + "min", f);
// menuItemSize[i].Height += 2;
// maxWidth = Math.Max(maxWidth, menuItemSize[i].Width + GetLeftRightSpacing());
// }
//
// typeSize = g.MeasureString(typeAreaText, f);
// typeSize.Height += 2;
// maxWidth = Math.Max(maxWidth, typeSize.Width + GetLeftRightSpacing());
//
// for (int i = 0; i < menu.MenuItems.Count; ++i) {
// menuItemAreas[i] = new RectangleF(curX + this.borderSize.Width,
// curY + this.borderSize.Height,
// isHorizontal ? menuItemSize[i].Width : maxWidth,
// SystemInformation.MenuHeight);
//
// if (this.isHorizontal) {
// curX += menuItemAreas[i].Width + 4;
// } else {
// curY += menuItemAreas[i].Height;
// }
// }
//
// typeArea = new RectangleF(curX + this.borderSize.Width,
// curY + this.borderSize.Height,
// isHorizontal ? typeSize.Width : maxWidth,
// SystemInformation.MenuHeight);
//
// g.Dispose();
// }
//
// protected void DrawTypeHere(Graphics g, bool isSelected, bool isMouseOver)
// {
// int yOffset = (int)((typeArea.Height - typeSize.Height) / 2);
//
// if (isSelected && iveTheFocus) {
// DrawSelcectionRectangle(g, typeArea, isMouseOver, false, true);
// } else {
// g.FillRectangle(new SolidBrush(Color.White),
// (int)typeArea.X + 2,
// (int)typeArea.Y + yOffset,
// (int)typeArea.Width - 4,
// (int)typeSize.Height);
//
// g.DrawRectangle(new Pen(Color.Gray),
// (int)typeArea.X + 2,
// (int)typeArea.Y + yOffset,
// (int)typeArea.Width - 4,
// (int)typeSize.Height);
// }
//
//
// g.DrawString(typeAreaText,
// SystemInformation.MenuFont,
// SystemBrushes.InactiveBorder,
// (int)typeArea.X + this.GetLeftSpacing(),
// (int)typeArea.Y + yOffset);
// }
//
// protected void DrawSelcectionRectangle(Graphics g, RectangleF drawArea, bool isMouseOver, bool mouseOverLeft, bool alwaysSelectAll)
// {
// g.FillRectangle(SystemBrushes.Highlight,
// (int)drawArea.X + 2,
// (int)drawArea.Y + 2,
// (int)drawArea.Width - 3,
// (int)drawArea.Height - 3);
//
// if (isMouseOver) {
// if (mouseOverLeft) {
// g.DrawRectangle(new Pen(Color.White),
// (int)drawArea.X + 2,
// (int)drawArea.Y + 2,
// (int)this.GetLeftSpacing() - 3,
// (int)drawArea.Height - 3);
// } else {
// if (this.drawMenuGlyphs && !alwaysSelectAll) {
// g.DrawRectangle(new Pen(Color.White),
// (int)drawArea.X + this.GetLeftSpacing(),
// (int)drawArea.Y + 2,
// (int)drawArea.Width - 1 - this.GetLeftSpacing() - 1,
// (int)drawArea.Height - 3);
// } else {
// g.DrawRectangle(new Pen(Color.White),
// (int)drawArea.X + 2,
// (int)drawArea.Y + 2,
// (int)drawArea.Width - 3,
// (int)drawArea.Height - 3);
// }
// }
// }
//
// g.DrawRectangle(new Pen(new HatchBrush(HatchStyle.Percent50, SystemColors.Highlight, SystemColors.Menu)),
// (int)drawArea.X,
// (int)drawArea.Y,
// (int)drawArea.Width,
// (int)drawArea.Height);
// }
//
// protected void DrawItem(Graphics g, int i, bool isSelected, bool isMouseOver)
// {
// Brush drawBrush = SystemBrushes.ControlText;
// if (isSelected && iveTheFocus) {
// DrawSelcectionRectangle(g, menuItemAreas[i], isMouseOver, isMouseOverLeftSpacing, menu.MenuItems[i].MenuItems.Count > 0);
// drawBrush = SystemBrushes.HighlightText;
// }
//
// int yOffset = (int)((menuItemAreas[i].Height - menuItemSize[i].Height) / 2);
// g.DrawString(menu.MenuItems[i].Text,
// SystemInformation.MenuFont,
// drawBrush,
// (int)menuItemAreas[i].X + this.GetLeftSpacing(),
// (int)menuItemAreas[i].Y + yOffset + 1);
//
// if (drawMenuGlyphs) {
// int r = SystemInformation.MenuHeight;
// if (menu.MenuItems[i].Checked) {
// ControlPaint.DrawMenuGlyph(g, (int)menuItemAreas[i].X,
// (int)menuItemAreas[i].Y,
// r, r, MenuGlyph.Checkmark);
// }
// if (menu.MenuItems[i].MenuItems.Count > 0) {
// ControlPaint.DrawMenuGlyph(g, (int)(menuItemAreas[i].Right - r),
// (int)(menuItemAreas[i].Y),
// r, r, MenuGlyph.Arrow);
// }
// }
// }
//
// protected override void OnPaint(PaintEventArgs pe)
// {
// Graphics g = pe.Graphics;
// Font f = System.Windows.Forms.SystemInformation.MenuFont;
//
// MeasureMenuItems();
//
// for (int i = 0; i < menu.MenuItems.Count; ++i) {
// DrawItem(g, i, this.selectedItem == i, i == mouseOverItem);
// }
//
// if (MenuEditorFocused) {
// DrawTypeHere(g, this.selectedItem == menu.MenuItems.Count, mouseOverItem == menu.MenuItems.Count);
// ShowSubMenuEditor();
// }
// }
//
// public void CloseSubMenuEditor()
// {
// if (this.subMenuEditor != null) {
// try {
// subMenuEditor.Parent.Controls.Remove(subMenuEditor);
// } catch (Exception e) {
// Console.WriteLine(e);
// }
// subMenuEditor.Parent = null;
// try {
// this.subMenuEditor.Dispose();
// this.subMenuEditor = null;
// } catch (Exception e) {
// Console.WriteLine(e);
// }
// }
// }
//
// protected override void Dispose(bool disposing)
// {
// base.Dispose(disposing);
// CloseSubMenuEditor();
// }
//
// protected virtual void ShowSubMenuEditor()
// {
// if (this.selectedItem >= 0 && this.selectedItem < menu.MenuItems.Count) {
// if (menu.MenuItems[this.selectedItem].Checked) {
// CloseSubMenuEditor();
// } else {
// if (subMenuEditor == null || subMenuEditor.menu != menu.MenuItems[this.selectedItem]) {
// SubMenuEditorControl panel = new SubMenuEditorControl(host, this, menu.MenuItems[this.selectedItem]);
// panel.Location = GetSubmenuLocation(this.selectedItem);
// rootControl.Parent.Controls.Add(panel);
// panel.BringToFront();
// if (this.subMenuEditor != null) {
// CloseSubMenuEditor();
// }
// this.subMenuEditor = panel;
// }
// }
// } else if (this.selectedItem == menu.MenuItems.Count) {
// CloseSubMenuEditor();
// }
// }
//
// protected virtual Point GetSubmenuLocation(int menuIndex)
// {
// // implementation for a top leven menu
// RectangleF r;
// if (menuItemAreas == null || menuIndex >= menu.MenuItems.Count || menuIndex < 0) {
// r = typeArea;
// } else {
// r = menuItemAreas[menuIndex];
// }
//
// return new Point((int)(Left + r.X),
// (int)(Top + SystemInformation.MenuHeight));
// }
//
// int GetItemIndex(int x, int y)
// {
// if (menuItemAreas != null) {
// for (int i = 0; i < menuItemAreas.Length; ++i) {
// if (menuItemAreas[i].Contains(x, y)) {
// return i;
// }
// }
// }
// return -1;
// }
//
// protected override void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
// {
// int itemIndex = GetItemIndex(e.X, e.Y);
// AbstractMenuEditorControl.MenuEditorFocused = true;
//
// Select();
// if (itemIndex == -1 && typeArea.Contains(e.X, e.Y)) {
// SelectedItem = menu.MenuItems.Count;
// } else {
// SelectedItem = itemIndex;
// }
// }
//
// protected override void OnMouseLeave(System.EventArgs e)
// {
// base.OnMouseLeave(e);
// if (-1 != mouseOverItem) {
// mouseOverItem = -1;
// Refresh();
// }
// }
//
//
// protected override void OnMouseMove(System.Windows.Forms.MouseEventArgs e)
// {
// int itemIndex = GetItemIndex(e.X, e.Y);
//
// int newMouseOver;
// bool newIsMouseOverLeftSpacing = e.X < GetLeftSpacing();
//
// if (itemIndex == -1 && typeArea.Contains(e.X, e.Y)) {
// newMouseOver = menu.MenuItems.Count;
// newIsMouseOverLeftSpacing = false;
// } else {
// newMouseOver = itemIndex;
// if (itemIndex >= 0 && itemIndex < menu.MenuItems.Count) {
// newIsMouseOverLeftSpacing &= menu.MenuItems[itemIndex].MenuItems.Count == 0;
// }
// }
//
// if (newMouseOver != mouseOverItem || newIsMouseOverLeftSpacing != isMouseOverLeftSpacing) {
// mouseOverItem = newMouseOver;
// isMouseOverLeftSpacing = newIsMouseOverLeftSpacing;
// Refresh();
// }
// }
//
//
// protected override void OnMouseUp(MouseEventArgs e)
// {
// base.OnMouseUp(e);
// if (oldSelectedItem == selectedItem) {
// int itemIndex = GetItemIndex(e.X, e.Y);
//
// if (itemIndex == -1 && typeArea.Contains(e.X, e.Y)) {
//// if (menu.MenuItems.Count == selectedItem) {
//// EditMode(menu.MenuItems.Count);
//// }
// } else {
// if (itemIndex == selectedItem && itemIndex != -1) {
// if (isMouseOverLeftSpacing) {
// menu.MenuItems[itemIndex].Checked = !menu.MenuItems[itemIndex].Checked;
// Refresh();
// } else {
// EditMode(itemIndex);
// }
// }
// }
// }
// }
//
// protected override void OnKeyPress(System.Windows.Forms.KeyPressEventArgs e)
// {
// base.OnKeyPress(e);
// EditMode(selectedItem);
// if (itemEditor != null) {
// itemEditor.Text = String.Empty;
// itemEditor.AppendText(e.KeyChar.ToString());
// }
// }
//
// protected override bool ProcessDialogKey(System.Windows.Forms.Keys keyData)
// {
// switch (keyData) {
// case Keys.Home:
// SelectItem(ItemSelection.First);
// return true;
// case Keys.End:
// SelectItem(ItemSelection.Last);
// return true;
// case Keys.Return:
// EditMode(this.SelectedItem);
// return true;
// case Keys.Left:
// SelectItem(ItemSelection.Prev);
// return true;
// case Keys.Right:
// SelectItem(ItemSelection.Next);
// return true;
// case Keys.Up:
// if (subMenuEditor != null) {
// subMenuEditor.Focus();
// subMenuEditor.SelectItem(ItemSelection.Last);
// }
// return true;
// case Keys.Down:
// if (subMenuEditor != null) {
// subMenuEditor.Focus();
// subMenuEditor.SelectItem(ItemSelection.First);
// }
// return true;
// case Keys.Escape: {
// SelectedItem = -1;
// AbstractMenuEditorControl.MenuEditorFocused = false;
// Refresh();
// ISelectionService selectionService = (ISelectionService)host.GetService(typeof(ISelectionService));
// selectionService.SetSelectedComponents(new object[] { host.RootComponent });
// return true;
// }
// case Keys.Back:
// case Keys.Delete: {
// if (itemEditor != null && !itemEditor.Focused) {
// DeleteCommand();
// return true;
// }
// break;
// }
//
// }
// return base.ProcessDialogKey(keyData);
// }
// public void DeleteCommand()
// {
// if (selectedItem >= 0 && selectedItem < menu.MenuItems.Count) { // && subMenuEditor == null
// ISelectionService selectionService = (ISelectionService)host.GetService(typeof(ISelectionService));
// if (selectedItem == 0) {
// selectionService.SetSelectedComponents(new object[] { });
// } else {
// selectionService.SetSelectedComponents(new object[] { menu.MenuItems[selectedItem - 1] });
// }
// ComponentChangeService componentChangeService = (ComponentChangeService)host.GetService(typeof(IComponentChangeService));
//
// PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(menu);
// System.ComponentModel.PropertyDescriptor myProperty = properties.Find("MenuItems", false);
//
// object[] oldArray = new object[menu.MenuItems.Count];
// menu.MenuItems.CopyTo(oldArray, 0);
// MenuItem item = menu.MenuItems[selectedItem];
//
// DesignerTransaction transaction = host.CreateTransaction("remove menu item");
// componentChangeService.OnComponentChanging(menu, myProperty);
// menu.MenuItems.Remove(item);
// componentChangeService.OnComponentChanged(menu, myProperty, oldArray, menu.MenuItems);
//
// host.DestroyComponent(item);
// transaction.Commit();
// SetSize(null, null);
// Refresh();
// }
// }
//
// public void SelectItem(ItemSelection selection)
// {
// switch (selection) {
// case ItemSelection.Last:
// SelectedItem = menu.MenuItems.Count;
// break;
// case ItemSelection.First:
// SelectedItem = 0;
// break;
// case ItemSelection.Next:
// this.SelectedItem = (SelectedItem == menu.MenuItems.Count ? 0 : selectedItem + 1);
// break;
// case ItemSelection.Prev:
// this.SelectedItem = (SelectedItem == 0 ? menu.MenuItems.Count : selectedItem - 1);
// break;
// }
// }
//
// void EditMode(int itemNumber)
// {
// if (itemNumber < 0 || !canEditMenuItems) {
// return;
// }
// try {
// itemEditor = new ItemEditor(this);
// RectangleF r = itemNumber >= menu.MenuItems.Count ? this.typeArea : menuItemAreas[itemNumber];
// SizeF s = itemNumber >= menu.MenuItems.Count ? this.typeSize : menuItemSize[itemNumber];
// int yOffset = (int)((r.Height - s.Height) / 2);
// itemEditor.SetBounds((int)r.X + 2 + this.GetLeftSpacing(),
// (int)r.Y + yOffset,
// (int)r.Width - 4,
// (int)r.Height);
//
// if (itemNumber >= menu.MenuItems.Count) {
// DesignerTransaction transaction = host.CreateTransaction("create menu item");
// ComponentChangeService componentChangeService = (ComponentChangeService)host.GetService(typeof(IComponentChangeService));
// MenuItem newItem = (MenuItem)host.CreateComponent(typeof(MenuItem));
// componentChangeService.OnComponentAdding(newItem);
//
// newItem.Text = newItem.Site.Name;
// menu.MenuItems.Add(newItem);
// componentChangeService.OnComponentAdded(newItem);
// transaction.Commit();
// MeasureMenuItems();
// }
// itemEditor.SetItem(menu.MenuItems[itemNumber]);
// base.Controls.Add(itemEditor);
// MenuEditorFocused = true;
// itemEditor.Select();
// MenuEditorFocused = true;
// Refresh();
// } catch (Exception e) {
// Console.WriteLine(e);
// if (itemEditor != null) {
// base.Controls.Remove(itemEditor);
// itemEditor.Dispose();
// itemEditor = null;
// }
// }
// }
// }
//}

71
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/ContextMenuEditorControl.cs

@ -1,71 +0,0 @@ @@ -1,71 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.Diagnostics;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.ComponentModel.Design;
//using System.Windows.Forms;
//using System.Windows.Forms.Design;
//
//using System.Drawing.Design;
//
//namespace ICSharpCode.FormDesigner {
//
// public class ContextMenuEditorControl : AbstractMenuEditorControl
// {
// public ContextMenuEditorControl(IDesignerHost host, Menu menu) : base(host, menu)
// {
// typeAreaText = "Context Menu";
// canEditMenuItems = false;
// MeasureMenuItems();
// }
//
// protected override void OnLostFocus(EventArgs e)
// {
// MenuEditorFocused = base.subMenuEditor != null && !subMenuEditor.iveTheFocus;
// base.OnLostFocus(e);
// }
//
// protected override void MeasureMenuItems()
// {
// Graphics g = base.CreateGraphics();
// Font f = System.Windows.Forms.SystemInformation.MenuFont;
//
// typeSize = g.MeasureString(typeAreaText, f);
// typeArea = new RectangleF(this.borderSize.Width,
// this.borderSize.Height,
// typeSize.Width,
// SystemInformation.MenuHeight);
// g.Dispose();
// }
//
// protected override void OnPaint(PaintEventArgs pe)
// {
// MeasureMenuItems();
// DrawTypeHere(pe.Graphics, this.selectedItem == menu.MenuItems.Count, mouseOverItem == menu.MenuItems.Count);
// if (MenuEditorFocused) {
// ShowSubMenuEditor();
// }
// }
//
// protected override void ShowSubMenuEditor()
// {
// if (this.selectedItem >= 0) {
// SubMenuEditorControl panel = new SubMenuEditorControl(host, this, menu);
// panel.Location = GetSubmenuLocation(this.selectedItem);
// panel.Parent = rootControl.Parent;
// panel.BringToFront();
// panel.Select();
// CloseSubMenuEditor();
// this.subMenuEditor = panel;
// }
// }
// }
//}

81
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/ItemEditor.cs

@ -1,81 +0,0 @@ @@ -1,81 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.Diagnostics;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.ComponentModel.Design;
//using System.Windows.Forms;
//using System.Windows.Forms.Design;
//
//using System.Drawing.Design;
//
//namespace ICSharpCode.FormDesigner
//{
// public class ItemEditor : TextBox
// {
// MenuItem item = null;
// AbstractMenuEditorControl motherEditor;
// bool isEscape = false;
//
// public ItemEditor(AbstractMenuEditorControl motherEditor)
// {
// this.motherEditor = motherEditor;
// base.BorderStyle = BorderStyle.None;
// }
//
// protected override bool ProcessDialogKey(System.Windows.Forms.Keys keyData)
// {
// switch (keyData) {
// case Keys.Escape:
// isEscape = true;
// CloseItemEditor();
// return true;
// case Keys.Return:
// try {
// item.Text = Text;
// } catch (Exception e) {
// Console.WriteLine(e);
// }
// CloseItemEditor();
// return true;
// }
// return base.ProcessDialogKey(keyData);
// }
//
// protected override void OnLostFocus(System.EventArgs e)
// {
// if (!isEscape) {
// try {
// item.Text = Text;
// } catch (Exception ex) {
// Console.WriteLine(ex);
// }
// CloseItemEditor();
// }
// }
//
// void CloseItemEditor()
// {
// base.Dispose();
// motherEditor.SetSize(null, null);
// motherEditor.Invalidate();
// motherEditor.Update();
// }
//
// public void SetItem(MenuItem item)
// {
// this.item = item;
// this.Text = item.Text;
// AbstractMenuEditorControl.MenuEditorFocused = true;
// }
//
//
// }
//}

33
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/MainMenuEditorControl.cs

@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.Diagnostics;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.ComponentModel.Design;
//using System.Windows.Forms;
//using System.Windows.Forms.Design;
//
//using System.Drawing.Design;
//
//namespace ICSharpCode.FormDesigner {
//
// public class MainMenuEditorControl : AbstractMenuEditorControl
// {
// public MainMenuEditorControl(IDesignerHost host, Menu menu) : base(host, menu)
// {
// }
//
// protected override void OnLostFocus(EventArgs e)
// {
// MenuEditorFocused = base.subMenuEditor != null && !subMenuEditor.iveTheFocus;
// base.OnLostFocus(e);
// }
// }
//}

52
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/MenuDesigner.cs

@ -1,52 +0,0 @@ @@ -1,52 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.Diagnostics;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.ComponentModel.Design;
//using System.Windows.Forms;
//using System.Windows.Forms.Design;
//
//using System.Drawing.Design;
//using ICSharpCode.FormDesigner;
//
//namespace Microsoft.VisualStudio.Windows.Forms {
//
// public class MenuDesigner : ComponentDesigner
// {
// DesignerVerbCollection designerVerbCollection = new DesignerVerbCollection();
//
// public override void DoDefaultAction()
// {
// Console.WriteLine("MenuDesigner.DoDefaultAction");
// }
//
// public override void Initialize(IComponent component)
// {
// base.Initialize(component);
// }
//
// public override ICollection AssociatedComponents {
// get {
// Menu menu = base.Component as Menu;
// if (menu != null) {
// return menu.MenuItems;
// }
// return null;
// }
// }
//
// public override DesignerVerbCollection Verbs {
// get {
// return designerVerbCollection;
// }
// }
// }
//}

134
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/MenuEditorService.cs

@ -1,134 +0,0 @@ @@ -1,134 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.Diagnostics;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.ComponentModel.Design;
//using System.Windows.Forms;
//using System.Windows.Forms.Design;
//
//using System.Drawing.Design;
//
//namespace ICSharpCode.FormDesigner {
//
// public class MenuEditorService : IMenuEditorService
// {
// IDesignerHost host;
// bool isActive = false;
//
// AbstractMenuEditorControl menuEditorControl = null;
// Menu menu;
//
// public IDesignerHost Host {
// get {
// return host;
// }
// set {
// host = value;
// }
// }
//
// public AbstractMenuEditorControl MenuEditorControl {
// get {
// return menuEditorControl;
// }
// }
//
//
// public MenuEditorService(IDesignerHost host)
// {
// this.host = host;
// Initialize();
// }
//
// void Initialize()
// {
// ISelectionService selectionService = (ISelectionService)host.GetService(typeof(ISelectionService));
// selectionService.SelectionChanged += new EventHandler(HandleSelectionChange);
// }
//
// void HandleSelectionChange(object sender, EventArgs e)
// {
// ISelectionService selectionService = (ISelectionService)host.GetService(typeof(ISelectionService));
// Menu selectedMenu = selectionService.PrimarySelection as Menu;
//
// if (selectedMenu != null) {
// if (menu != selectedMenu && (selectedMenu is MainMenu || selectedMenu is ContextMenu)) {
// DisposeMenuEditorControl();
// this.menu = selectedMenu;
// InitMenuEditorControl();
// }
// } else {
// if (menuEditorControl != null && selectionService.PrimarySelection != null) {
// AbstractMenuEditorControl.MenuEditorFocused = false;
// menuEditorControl.CloseSubMenuEditor();
// menuEditorControl.Refresh();
// }
// }
// }
//
// public void Dispose()
// {
// }
//
// void DisposeMenuEditorControl()
// {
// if (menuEditorControl != null) {
// menuEditorControl.Dispose();
// menuEditorControl = null;
// }
// }
//
// void InitMenuEditorControl()
// {
// Control rootComponent = host.RootComponent as Control;
// if (rootComponent != null) {
// menuEditorControl = (menu is MainMenu) ? (AbstractMenuEditorControl)new MainMenuEditorControl(host, menu) :
// (AbstractMenuEditorControl)new ContextMenuEditorControl(host, menu);
// rootComponent.Parent.Controls.Add(menuEditorControl);
// menuEditorControl.BringToFront();
// }
// }
//
//
//#region System.Windows.Forms.Design.IMenuEditorService interface implementation
// public bool IsActive()
// {
// return isActive;
// }
//
// public bool MessageFilter(ref System.Windows.Forms.Message m)
// {
// return false;
// }
//
// public void SetSelection(System.Windows.Forms.MenuItem item)
// {
// Console.WriteLine("!!!TODO!!! SET SELECTION TO : " + item);
// }
//
// public void SetMenu(System.Windows.Forms.Menu menu)
// {
// this.menu = menu;
// isActive = menu != null;
// if (isActive) {
// InitMenuEditorControl();
// } else {
// DisposeMenuEditorControl();
// }
// }
//
// public System.Windows.Forms.Menu GetMenu()
// {
// return menu;
// }
//#endregion
// }
//}

139
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/MenuDesigner/SubMenuEditorControl.cs

@ -1,139 +0,0 @@ @@ -1,139 +0,0 @@
//// <file>
//// <copyright see="prj:///doc/copyright.txt"/>
//// <license see="prj:///doc/license.txt"/>
//// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
//// <version value="$version"/>
//// </file>
//
//using System;
//using System.Diagnostics;
//using System.Drawing;
//using System.Collections;
//using System.ComponentModel;
//using System.ComponentModel.Design;
//using System.Windows.Forms;
//using System.Windows.Forms.Design;
//
//using System.Drawing.Design;
//
//namespace ICSharpCode.FormDesigner {
//
// public class SubMenuEditorControl : AbstractMenuEditorControl
// {
// AbstractMenuEditorControl owner;
//
// public SubMenuEditorControl(IDesignerHost host, AbstractMenuEditorControl owner, Menu menu) : base(host, menu)
// {
// isHorizontal = false;
// drawMenuGlyphs = true;
// borderSize = SystemInformation.FrameBorderSize;
// SetSize(null, null);
// this.owner = owner;
// }
//
// public override void SetSize(object sender, EventArgs e)
// {
// try {
// MeasureMenuItems();
// int maxWidth = (int)base.typeArea.Width + base.borderSize.Width * 2;
// foreach (RectangleF rect in menuItemAreas) {
// maxWidth = (int)Math.Max(maxWidth, rect.Width + base.borderSize.Width * 2);
// }
//
// Size = new Size(maxWidth, base.borderSize.Height * 2 + SystemInformation.MenuHeight * (menu.MenuItems.Count + 1));
//
// if (subMenuEditor != null) {
// subMenuEditor.Location = GetSubmenuLocation(this.selectedItem);
// }
// } catch (Exception ex) {
// Console.WriteLine(ex);
// if (Parent != null) {
// Parent.Controls.Remove(this);
// }
// }
// }
//
// protected override void OnPaintBackground(System.Windows.Forms.PaintEventArgs pevent)
// {
// base.OnPaintBackground(pevent);
// ControlPaint.DrawBorder3D(pevent.Graphics, new Rectangle(0, 0, Width, Height), Border3DStyle.Raised);
// }
//
// protected override Point GetSubmenuLocation(int menuIndex)
// {
// RectangleF r;
// if (menuItemAreas == null || menuIndex >= menu.MenuItems.Count || menuIndex < 0) {
// r = base.typeArea;
// } else {
// r = base.menuItemAreas[menuIndex];
// }
// return new Point((int)(Right - 2),
// (int)(Top + r.Y));
// }
//
//
// protected override bool ProcessDialogKey(System.Windows.Forms.Keys keyData)
// {
// switch (keyData) {
// case Keys.Up:
// if (SelectedItem == 0) {
// if (!(owner is SubMenuEditorControl)) {
// owner.Focus();
// } else {
// SelectedItem = menu.MenuItems.Count;
// }
// } else {
// SelectItem(ItemSelection.Prev);
// }
// Refresh();
// return true;
// case Keys.Down:
// if (SelectedItem >= menu.MenuItems.Count) {
// if (!(owner is SubMenuEditorControl)) {
// owner.Focus();
// } else {
// SelectedItem = 0;
// }
// } else {
// SelectItem(ItemSelection.Next);
// }
// Refresh();
// return true;
// case Keys.Escape:
// owner.CloseSubMenuEditor();
// owner.Focus();
// return true;
// case Keys.Left: {
// AbstractMenuEditorControl topLevel = GetTopLevelMenuControl();
// if (topLevel == owner) {
// topLevel.Focus();
// topLevel.SelectItem(ItemSelection.Prev);
// } else {
// goto case Keys.Escape;
// }
// return true;
// }
// case Keys.Right:
// if (base.subMenuEditor != null) {
// subMenuEditor.Focus();
// subMenuEditor.SelectItem(ItemSelection.First);
// } else {
// AbstractMenuEditorControl topLevel = GetTopLevelMenuControl();
// topLevel.Focus();
// topLevel.SelectItem(ItemSelection.Next);
// }
// return true;
// }
// return base.ProcessDialogKey(keyData);
// }
//
// AbstractMenuEditorControl GetTopLevelMenuControl()
// {
// AbstractMenuEditorControl curControl = owner;
// while (curControl is SubMenuEditorControl) {
// curControl = ((SubMenuEditorControl)curControl).owner;
// }
// return curControl;
// }
// }
//}

8
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/FormDesignerSecondaryDisplayBinding.cs → src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/SecondaryDisplayBinding.cs

@ -13,12 +13,12 @@ using ICSharpCode.SharpDevelop.Gui; @@ -13,12 +13,12 @@ using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.NRefactory.Parser;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormsDesigner.Services;
using System.ComponentModel.Design;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class FormDesignerSecondaryDisplayBinding : ISecondaryDisplayBinding
public class FormsDesignerSecondaryDisplayBinding : ISecondaryDisplayBinding
{
public static IMethod GetInitializeComponents(IClass c)
{
@ -123,7 +123,7 @@ namespace ICSharpCode.FormDesigner @@ -123,7 +123,7 @@ namespace ICSharpCode.FormDesigner
default:
throw new ApplicationException("Cannot create content for " + fileExtension);
}
return new ISecondaryViewContent[] { new FormDesignerViewContent(viewContent, loader, generator) };
return new ISecondaryViewContent[] { new FormsDesignerViewContent(viewContent, loader, generator) };
}
}
}

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DefaultServiceContainer.cs

@ -15,7 +15,7 @@ using System.ComponentModel.Design; @@ -15,7 +15,7 @@ using System.ComponentModel.Design;
using System.Windows.Forms.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class DefaultServiceContainer : IServiceContainer, IDisposable
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DesignerEventService.cs

@ -17,7 +17,7 @@ using System.Windows.Forms.Design; @@ -17,7 +17,7 @@ using System.Windows.Forms.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class DesignerEventService : IDesignerEventService
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DesignerOptionService.cs

@ -12,7 +12,7 @@ using System.ComponentModel.Design; @@ -12,7 +12,7 @@ using System.ComponentModel.Design;
using System.Windows.Forms.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class SharpDevelopDesignerOptions : DesignerOptions
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/DesignerResourceService.cs

@ -21,7 +21,7 @@ using ICSharpCode.SharpDevelop.Gui; @@ -21,7 +21,7 @@ using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Project.Commands;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class DesignerResourceService : System.ComponentModel.Design.IResourceService , IDisposable
{

10
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/EventBindingService.cs

@ -15,7 +15,7 @@ using System.Globalization; @@ -15,7 +15,7 @@ using System.Globalization;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class EventBindingService : System.ComponentModel.Design.EventBindingService
{
@ -34,7 +34,7 @@ namespace ICSharpCode.FormDesigner.Services @@ -34,7 +34,7 @@ namespace ICSharpCode.FormDesigner.Services
{
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window != null) {
FormDesignerViewContent formDesigner = window.ActiveViewContent as FormDesignerViewContent;
FormsDesignerViewContent formDesigner = window.ActiveViewContent as FormsDesignerViewContent;
if (formDesigner != null) {
return formDesigner.GetCompatibleMethods(e);
@ -50,7 +50,7 @@ namespace ICSharpCode.FormDesigner.Services @@ -50,7 +50,7 @@ namespace ICSharpCode.FormDesigner.Services
return false;
}
FormDesignerViewContent formDesigner = window.ActiveViewContent as FormDesignerViewContent;
FormsDesignerViewContent formDesigner = window.ActiveViewContent as FormsDesignerViewContent;
if (formDesigner != null) {
formDesigner.ShowSourceCode();
@ -66,7 +66,7 @@ namespace ICSharpCode.FormDesigner.Services @@ -66,7 +66,7 @@ namespace ICSharpCode.FormDesigner.Services
return false;
}
FormDesignerViewContent formDesigner = window.ActiveViewContent as FormDesignerViewContent;
FormsDesignerViewContent formDesigner = window.ActiveViewContent as FormsDesignerViewContent;
if (formDesigner != null) {
formDesigner.ShowSourceCode(lineNumber);
@ -81,7 +81,7 @@ namespace ICSharpCode.FormDesigner.Services @@ -81,7 +81,7 @@ namespace ICSharpCode.FormDesigner.Services
if (window == null || edesc == null || edesc.Name == null || edesc.Name.Length == 0) {
return false;
}
FormDesignerViewContent formDesigner = window.ActiveViewContent as FormDesignerViewContent;
FormsDesignerViewContent formDesigner = window.ActiveViewContent as FormsDesignerViewContent;
if (formDesigner != null) {
formDesigner.ShowSourceCode(component, edesc, methodName);

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/HelpService.cs

@ -19,7 +19,7 @@ using Microsoft.Win32; @@ -19,7 +19,7 @@ using Microsoft.Win32;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
/// <summary>
/// BaseImlementation of IHelpService

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/MenuCommandService.cs

@ -19,7 +19,7 @@ using System.Windows.Forms.Design; @@ -19,7 +19,7 @@ using System.Windows.Forms.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
class MenuCommandService : IMenuCommandService
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/PropertyValueUIService.cs

@ -16,7 +16,7 @@ using System.ComponentModel; @@ -16,7 +16,7 @@ using System.ComponentModel;
using System.Drawing.Design;
using System.Collections;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class PropertyValueUIService : IPropertyValueUIService
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/ToolboxService.cs

@ -13,7 +13,7 @@ using System.Drawing.Design; @@ -13,7 +13,7 @@ using System.Drawing.Design;
using System.ComponentModel.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public delegate void ToolboxEventHandler(object sender, ToolboxEventArgs tea);

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeDescriptorFilterService.cs

@ -10,7 +10,7 @@ using System.Collections; @@ -10,7 +10,7 @@ using System.Collections;
using System.ComponentModel;
using System.ComponentModel.Design;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class TypeDescriptorFilterService : ITypeDescriptorFilterService
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeDiscoveryService.cs

@ -17,7 +17,7 @@ using System.ComponentModel.Design; @@ -17,7 +17,7 @@ using System.ComponentModel.Design;
using System.Reflection;
using System.Windows.Forms;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class TypeDiscoveryService : ITypeDiscoveryService
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/TypeResolutionService.cs

@ -14,7 +14,7 @@ using System.ComponentModel; @@ -14,7 +14,7 @@ using System.ComponentModel;
using System.ComponentModel.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class TypeResolutionService : ITypeResolutionService
{

2
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/UIService.cs

@ -14,7 +14,7 @@ using System.Windows.Forms.Design; @@ -14,7 +14,7 @@ using System.Windows.Forms.Design;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormDesigner.Services
namespace ICSharpCode.FormsDesigner.Services
{
public class UIService : IUIService
{

14
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/ToolboxProvider.cs

@ -26,8 +26,8 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; @@ -26,8 +26,8 @@ using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.Core;
using ICSharpCode.FormDesigner.Services;
using ICSharpCode.FormDesigner.Gui;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.FormsDesigner.Gui;
using System.CodeDom;
using System.CodeDom.Compiler;
@ -35,11 +35,11 @@ using System.CodeDom.Compiler; @@ -35,11 +35,11 @@ using System.CodeDom.Compiler;
using Microsoft.CSharp;
using Microsoft.VisualBasic;
namespace ICSharpCode.FormDesigner
namespace ICSharpCode.FormsDesigner
{
public class ToolboxProvider
{
static ICSharpCode.FormDesigner.Services.ToolboxService toolboxService = null;
static ICSharpCode.FormsDesigner.Services.ToolboxService toolboxService = null;
static ITypeResolutionService typeResolutionService = new TypeResolutionService();
public static ArrayList SideTabs = new ArrayList();
@ -56,10 +56,10 @@ namespace ICSharpCode.FormDesigner @@ -56,10 +56,10 @@ namespace ICSharpCode.FormDesigner
return componentLibraryLoader;
}
}
public static ICSharpCode.FormDesigner.Services.ToolboxService ToolboxService {
public static ICSharpCode.FormsDesigner.Services.ToolboxService ToolboxService {
get {
if (toolboxService == null) {
toolboxService = new ICSharpCode.FormDesigner.Services.ToolboxService();
toolboxService = new ICSharpCode.FormsDesigner.Services.ToolboxService();
ReloadSideTabs(false);
toolboxService.SelectedItemUsed += new EventHandler(SelectedToolUsedHandler);
}
@ -141,7 +141,7 @@ namespace ICSharpCode.FormDesigner @@ -141,7 +141,7 @@ namespace ICSharpCode.FormDesigner
AxSideTab tab = SharpDevelopSideBar.SideBar.ActiveTab;
// try to add project reference
if (sender != null && sender is ICSharpCode.FormDesigner.Services.ToolboxService) {
if (sender != null && sender is ICSharpCode.FormsDesigner.Services.ToolboxService) {
ToolboxItem selectedItem = (sender as IToolboxService).GetSelectedToolboxItem();
if (tab is CustomComponentsSideTab) {
if (selectedItem != null && selectedItem.TypeName != null) {

6
src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/UndoRedo/FormDesignerUndoEngine.cs → src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/UndoRedo/UndoEngine.cs

@ -11,14 +11,14 @@ using System; @@ -11,14 +11,14 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.Design;
namespace ICSharpCode.FormDesigner.FormDesigner.UndoRedo
namespace ICSharpCode.FormsDesigner.UndoRedo
{
public class FormDesignerUndoEngine : UndoEngine, IUndoHandler
public class FormsDesignerUndoEngine : UndoEngine, IUndoHandler
{
Stack<UndoEngine.UndoUnit> undoStack = new Stack<UndoEngine.UndoUnit>();
Stack<UndoEngine.UndoUnit> redoStack = new Stack<UndoEngine.UndoUnit>();
public FormDesignerUndoEngine(IServiceProvider provider) : base(provider)
public FormsDesignerUndoEngine(IServiceProvider provider) : base(provider)
{
}

3
src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin

@ -17,10 +17,9 @@ @@ -17,10 +17,9 @@
</Path>
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "FormDesigner"
<DisplayBinding id = "SubversionHistoryView"
type = "Secondary"
insertbefore = "Text"
supportedformats = "Forms/UserControls"
class = "ICSharpCode.Svn.HistoryViewDisplayBinding"/>
</Path>

4
src/Main/Base/Project/Src/Services/DisplayBinding/DisplayBindingDoozer.cs

@ -49,9 +49,9 @@ namespace ICSharpCode.Core @@ -49,9 +49,9 @@ namespace ICSharpCode.Core
/// </example>
/// <example title="Secondary display binding: Form designer">
/// &lt;Path name = "/SharpDevelop/Workbench/DisplayBindings"&gt;
/// &lt;DisplayBinding id = "FormDesigner"
/// &lt;DisplayBinding id = "FormsDesigner"
/// type = "Secondary"
/// class = "ICSharpCode.FormDesigner.FormDesignerSecondaryDisplayBinding"
/// class = "ICSharpCode.FormsDesigner.FormsDesignerSecondaryDisplayBinding"
/// fileNamePattern = "\.(cs|vb)$" /&gt;
/// &lt;/Path&gt;
/// </example>

Loading…
Cancel
Save