diff --git a/CICMMetadataEditor/CICMMetadataEditor.Desktop/Program.cs b/CICMMetadataEditor/CICMMetadataEditor.Desktop/Program.cs index 8169dc0..019a795 100644 --- a/CICMMetadataEditor/CICMMetadataEditor.Desktop/Program.cs +++ b/CICMMetadataEditor/CICMMetadataEditor.Desktop/Program.cs @@ -39,7 +39,7 @@ namespace CICMMetadataEditor.Desktop [STAThread] static void Main(string[] args) { - new Application(Eto.Platform.Detect).Run(new MainForm()); + new Application(Eto.Platform.Detect).Run(new dlgMetadata()); } } } \ No newline at end of file diff --git a/CICMMetadataEditor/CICMMetadataEditor.XamMac/Program.cs b/CICMMetadataEditor/CICMMetadataEditor.XamMac/Program.cs index 1521c65..2b6f661 100644 --- a/CICMMetadataEditor/CICMMetadataEditor.XamMac/Program.cs +++ b/CICMMetadataEditor/CICMMetadataEditor.XamMac/Program.cs @@ -37,7 +37,7 @@ namespace CICMMetadataEditor.XamMac { static void Main(string[] args) { - new Application(Eto.Platforms.XamMac2).Run(new MainForm()); + new Application(Eto.Platforms.XamMac2).Run(new dlgMetadata()); } } } diff --git a/CICMMetadataEditor/CICMMetadataEditor/MainForm.xeto b/CICMMetadataEditor/CICMMetadataEditor/MainForm.xeto deleted file mode 100644 index bba423e..0000000 --- a/CICMMetadataEditor/CICMMetadataEditor/MainForm.xeto +++ /dev/null @@ -1,60 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
\ No newline at end of file diff --git a/CICMMetadataEditor/CICMMetadataEditor/MainForm.xeto.cs b/CICMMetadataEditor/CICMMetadataEditor/MainForm.xeto.cs deleted file mode 100644 index 54f3742..0000000 --- a/CICMMetadataEditor/CICMMetadataEditor/MainForm.xeto.cs +++ /dev/null @@ -1,61 +0,0 @@ -// -// Author: -// Natalia Portillo claunia@claunia.com -// -// Copyright (c) 2017-2018, © Natalia Portillo -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the -// following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this list of conditions and the -// following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the -// following disclaimer in the documentation and/or other materials provided with the distribution. -// * Neither the name of the [ORGANIZATION] nor the names of its contributors may be used to endorse or promote -// products derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -using System; -using System.Collections.Generic; -using Eto.Forms; -using Eto.Drawing; -using Eto.Serialization.Xaml; - -namespace CICMMetadataEditor -{ - public class MainForm : Form - { - public MainForm() - { - XamlReader.Load(this); - } - - protected void HandleClickMe(object sender, EventArgs e) - { - MessageBox.Show("I was clicked!"); - } - - protected void HandleAbout(object sender, EventArgs e) - { - new AboutDialog().ShowDialog(this); - } - - protected void HandleQuit(object sender, EventArgs e) - { - Application.Instance.Quit(); - } - } -} diff --git a/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto b/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto index 559b9d9..9e75810 100644 --- a/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto +++ b/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto @@ -31,7 +31,7 @@ // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // --> - +
@@ -346,4 +346,24 @@ -
\ No newline at end of file + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto.cs b/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto.cs index 402d628..b403cf1 100644 --- a/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto.cs +++ b/CICMMetadataEditor/CICMMetadataEditor/dlgMetadata.xeto.cs @@ -41,7 +41,7 @@ using BorderType = Schemas.BorderType; namespace CICMMetadataEditor { - public class dlgMetadata : Dialog + public class dlgMetadata : Form { AdvertisementType[] adverts; AudioMediaType[] audiomedias; @@ -82,6 +82,36 @@ namespace CICMMetadataEditor LoadData(); } + protected void OnAboutClicked(object sender, EventArgs e) + { + new AboutDialog().ShowDialog(this); + } + + protected void OnQuitClicked(object sender, EventArgs e) + { + Application.Instance.Quit(); + } + + protected void OnNewClicked(object sender, EventArgs e) + { + + } + + protected void OnOpenClicked(object sender, EventArgs e) + { + + } + + protected void OnSaveClicked(object sender, EventArgs e) + { + + } + + protected void OnSaveAsClicked(object sender, EventArgs e) + { + + } + void LoadData() { Modified = false;