Skip to content

Commit

Permalink
Fixes #155
Browse files Browse the repository at this point in the history
  • Loading branch information
@rds1983
rds1983 committed Jan 10, 2020
1 parent 3ff9717 commit 217e95f
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 35 deletions.
3 changes: 1 addition & 2 deletions samples/Myra.Samples.Notepad/Notepad.Generated.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Generated by MyraPad at 06.01.2020 23:04:25 */
/* Generated by MyraPad at 10.01.2020 23:09:06 */
using Myra.Assets;
using Myra.Graphics2D;
using Myra.Graphics2D.TextureAtlases;
Expand Down Expand Up @@ -35,7 +35,6 @@ private void BuildUI()

menuItemSaveAs = new MenuItem();
menuItemSaveAs.Text = "Save &As...";
menuItemSaveAs.ShortcutText = "Ctrl+A";
menuItemSaveAs.Id = "menuItemSaveAs";

var menuSeparator1 = new MenuSeparator();
Expand Down
4 changes: 0 additions & 4 deletions samples/Myra.Samples.Notepad/NotepadGame.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@ protected override void LoadContent()
{
SaveItemOnDown(this, EventArgs.Empty);
}
else if (Desktop.DownKeys.Contains(Keys.A))
{
SaveAsItemOnDown(this, EventArgs.Empty);
}
else if (Desktop.DownKeys.Contains(Keys.Q))
{
Exit();
Expand Down
2 changes: 1 addition & 1 deletion samples/Myra.Samples.Notepad/notepad.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<MenuItem Text="&amp;New" ShortcutText="Ctrl+N" Id="menuItemNew" />
<MenuItem Text="&amp;Open..." ShortcutText="Ctrl+O" Id="menuItemOpen" />
<MenuItem Text="&amp;Save" ShortcutText="Ctrl+S" Id="menuItemSave" />
<MenuItem Text="Save &amp;As..." ShortcutText="Ctrl+A" Id="menuItemSaveAs" />
<MenuItem Text="Save &amp;As..." Id="menuItemSaveAs" />
<MenuSeparator />
<MenuItem Text="Debug Options" Id="menuItemDebugOptions" />
<MenuSeparator />
Expand Down
25 changes: 13 additions & 12 deletions src/MyraPad/UI/ExportOptionsDialog.Generated.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
/* Generated by MyraPad at 05.10.2019 16:02:40 */
/* Generated by MyraPad at 10.01.2020 23:09:31 */
using Myra.Assets;
using Myra.Graphics2D;
using Myra.Graphics2D.TextureAtlases;
using Myra.Graphics2D.UI;
using Myra.Graphics2D.Brushes;

#if !XENKO
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
#else
using Xenko.Core.Mathematics;
#endif
Expand All @@ -15,38 +20,34 @@ private void BuildUI()
{
var label1 = new Label();
label1.Text = "Class Name:";
label1.Id = "";
label1.GridRow = 1;

_textClassName = new TextBox();
_textClassName.Text = "";
_textClassName.Id = "_textClassName";
_textClassName.GridColumn = 1;
_textClassName.GridRow = 1;
_textClassName.Id = "_textClassName";

var label2 = new Label();
label2.Text = "Output Path:";
label2.GridRow = 2;

_textOutputPath = new TextBox();
_textOutputPath.Text = "";
_textOutputPath.Id = "_textOutputPath";
_textOutputPath.GridColumn = 1;
_textOutputPath.GridRow = 2;
_textOutputPath.Id = "_textOutputPath";

_buttonChangeOutputPath = new TextButton();
_buttonChangeOutputPath.Text = "Change...";
_buttonChangeOutputPath.Id = "_buttonChangeOutputPath";
_buttonChangeOutputPath.GridColumn = 2;
_buttonChangeOutputPath.GridRow = 2;
_buttonChangeOutputPath.Id = "_buttonChangeOutputPath";

var label3 = new Label();
label3.Text = "Namespace:";

_textNamespace = new TextBox();
_textNamespace.Text = "";
_textNamespace.Id = "_textNamespace";
_textNamespace.GridColumn = 1;
_textNamespace.Id = "_textNamespace";

Root = new Grid();
Root.ColumnSpacing = 8;
Expand All @@ -67,8 +68,8 @@ private void BuildUI()
{
Type = Myra.Graphics2D.UI.ProportionType.Auto,
});
Root.Id = "Root";
Root.Width = 800;
Root.Id = "Root";
Root.Widgets.Add(label1);
Root.Widgets.Add(_textClassName);
Root.Widgets.Add(label2);
Expand All @@ -79,8 +80,8 @@ private void BuildUI()


Title = "Export";
Left = 124;
Top = 138;
Left = 96;
Top = 133;
Content = Root;
}

Expand Down
11 changes: 8 additions & 3 deletions src/MyraPad/UI/NewProjectWizard.Generated.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
/* Generated by MyraPad at 05.10.2019 16:02:53 */
/* Generated by MyraPad at 10.01.2020 23:09:41 */
using Myra.Assets;
using Myra.Graphics2D;
using Myra.Graphics2D.TextureAtlases;
using Myra.Graphics2D.UI;
using Myra.Graphics2D.Brushes;

#if !XENKO
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
#else
using Xenko.Core.Mathematics;
#endif
Expand Down Expand Up @@ -62,8 +67,8 @@ private void BuildUI()


Title = "Choose Root Container";
Left = 431;
Top = 83;
Left = 403;
Top = 78;
Content = verticalStackPanel1;
}

Expand Down
5 changes: 2 additions & 3 deletions src/MyraPad/UI/StudioWidget.Generated.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* Generated by MyraPad at 06.01.2020 22:45:13 */
/* Generated by MyraPad at 10.01.2020 23:09:59 */
using Myra.Assets;
using Myra.Graphics2D;
using Myra.Graphics2D.TextureAtlases;
using Myra.Graphics2D.UI;
using Myra.Graphics2D.Brushes;

#if !XENKO
using Microsoft.Xna.Framework;
Expand Down Expand Up @@ -110,7 +111,6 @@ private void BuildUI()

var menuItem1 = new MenuItem();
menuItem1.Text = "&Edit";
menuItem1.Id = "";
menuItem1.Items.Add(_menuItemSelectAll);
menuItem1.Items.Add(_menuItemCopy);
menuItem1.Items.Add(_menuItemPaste);
Expand All @@ -123,7 +123,6 @@ private void BuildUI()

var menuItem2 = new MenuItem();
menuItem2.Text = "&Help";
menuItem2.Id = "";
menuItem2.Items.Add(_menuHelpAbout);

_mainMenu = new HorizontalMenu();
Expand Down
14 changes: 7 additions & 7 deletions src/MyraPad/UI/exportOptionsDialog.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project>
<Project.ExportOptions Namespace="MyraPad.UI" Class="ExportOptionsDialog" OutputPath="D:\Projects\Myra\src\MyraPad\UI" />
<Dialog Title="Export" Left="124" Top="138">
<Grid ColumnSpacing="8" RowSpacing="8" Id="Root" Width="800">
<Dialog Title="Export" Left="96" Top="133">
<Grid ColumnSpacing="8" RowSpacing="8" Width="800" Id="Root">
<Grid.DefaultRowProportion Type="Auto" />
<Grid.ColumnsProportions>
<Proportion Type="Auto" />
<Proportion Type="Fill" />
<Proportion Type="Auto" />
</Grid.ColumnsProportions>
<Label Text="Class Name:" Id="" GridRow="1" />
<TextBox Text="" Id="_textClassName" GridColumn="1" GridRow="1" />
<Label Text="Class Name:" GridRow="1" />
<TextBox GridColumn="1" GridRow="1" Id="_textClassName" />
<Label Text="Output Path:" GridRow="2" />
<TextBox Text="" Id="_textOutputPath" GridColumn="1" GridRow="2" />
<TextButton Text="Change..." Id="_buttonChangeOutputPath" GridColumn="2" GridRow="2" />
<TextBox GridColumn="1" GridRow="2" Id="_textOutputPath" />
<TextButton Text="Change..." GridColumn="2" GridRow="2" Id="_buttonChangeOutputPath" />
<Label Text="Namespace:" />
<TextBox Text="" Id="_textNamespace" GridColumn="1" />
<TextBox GridColumn="1" Id="_textNamespace" />
</Grid>
</Dialog>
</Project>
2 changes: 1 addition & 1 deletion src/MyraPad/UI/newProjectWizard.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<Project.ExportOptions Namespace="MyraPad.UI" Class="NewProjectWizard" OutputPath="D:\Projects\Myra\src\MyraPad\UI" />
<Dialog Title="Choose Root Container" Left="431" Top="81">
<Dialog Title="Choose Root Container" Left="403" Top="78">
<VerticalStackPanel>
<RadioButton Text="Grid" Id="_radioButtonGrid" />
<RadioButton Text="HorizontalStackPanel" Id="_radioButtonHorizontalStackPanel" />
Expand Down
4 changes: 2 additions & 2 deletions src/MyraPad/UI/studio.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
<MenuSeparator />
<MenuItem Text="&amp;Quit" ShortcutText="Ctrl+Q" Id="_menuFileQuit" />
</MenuItem>
<MenuItem Text="&amp;Edit" Id="">
<MenuItem Text="&amp;Edit">
<MenuItem Text="Select &amp;All" ShortcutText="Ctrl+A" Id="_menuItemSelectAll" />
<MenuItem Text="&amp;Copy" ShortcutText="Ctrl+Insert, Ctrl+C" Id="_menuItemCopy" />
<MenuItem Text="&amp;Paste" ShortcutText="Shift+Insert, Ctrl+V" Id="_menuItemPaste" />
<MenuSeparator />
<MenuItem Text="&amp;Format Source" ShortcutText="Ctrl+F" Id="_menuEditFormatSource" />
</MenuItem>
<MenuItem Text="&amp;Help" Id="">
<MenuItem Text="&amp;Help">
<MenuItem Text="&amp;About" Id="_menuHelpAbout" />
</MenuItem>
</HorizontalMenu>
Expand Down

0 comments on commit 217e95f

Please sign in to comment.