From 5a2de92355a3a4fd4b415ac978a66961146ae628 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 27 Aug 2018 15:07:51 +0100 Subject: [PATCH] Add devices list. --- .../.idea/contentModel.xml | 32 ++++--- DiscImageChef.Gui.XamMac/Info.plist | 12 +-- DiscImageChef.Gui/DiscImageChef.Gui.csproj | 8 +- DiscImageChef.Gui/MainForm.xeto | 34 -------- DiscImageChef.Gui/MainForm.xeto.cs | 31 ------- DiscImageChef.Gui/frmMain.xeto | 31 +++++++ DiscImageChef.Gui/frmMain.xeto.cs | 83 +++++++++++++++++++ DiscImageChef/Main.cs | 2 +- 8 files changed, 147 insertions(+), 86 deletions(-) delete mode 100644 DiscImageChef.Gui/MainForm.xeto delete mode 100644 DiscImageChef.Gui/MainForm.xeto.cs create mode 100644 DiscImageChef.Gui/frmMain.xeto create mode 100644 DiscImageChef.Gui/frmMain.xeto.cs diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml index a9fd63e3a..24c28fc19 100644 --- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml +++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml @@ -41,6 +41,8 @@ + + @@ -48,11 +50,9 @@ - - - - - + + + @@ -1246,6 +1246,20 @@ + + + + + + + + + + + + + + @@ -1545,11 +1559,9 @@ - - - - - + + + diff --git a/DiscImageChef.Gui.XamMac/Info.plist b/DiscImageChef.Gui.XamMac/Info.plist index 3c15930d3..bd26a82cf 100644 --- a/DiscImageChef.Gui.XamMac/Info.plist +++ b/DiscImageChef.Gui.XamMac/Info.plist @@ -2,12 +2,6 @@ - CFBundleName - EtoApp - CFBundleIdentifier - com.example.EtoApp - CFBundleShortVersionString - 1.0 CFBundleVersion 1 LSMinimumSystemVersion @@ -26,5 +20,11 @@ NSApplication XSAppIconAssets Assets.xcassets/AppIcon.appiconset + CFBundleName + DiscImageChef + CFBundleIdentifier + com.claunia.discimagechef + CFBundleShortVersionString + 4.99.0 diff --git a/DiscImageChef.Gui/DiscImageChef.Gui.csproj b/DiscImageChef.Gui/DiscImageChef.Gui.csproj index a2f7e2121..d00e57abe 100644 --- a/DiscImageChef.Gui/DiscImageChef.Gui.csproj +++ b/DiscImageChef.Gui/DiscImageChef.Gui.csproj @@ -1,17 +1,17 @@  - - netstandard1.6 + net461 DiscImageChef.Gui 1.0 DiscImageChef.Gui Copyright © 2018 Description of DiscImageChef.Gui - - + + + \ No newline at end of file diff --git a/DiscImageChef.Gui/MainForm.xeto b/DiscImageChef.Gui/MainForm.xeto deleted file mode 100644 index 0f82d1595..000000000 --- a/DiscImageChef.Gui/MainForm.xeto +++ /dev/null @@ -1,34 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
\ No newline at end of file diff --git a/DiscImageChef.Gui/MainForm.xeto.cs b/DiscImageChef.Gui/MainForm.xeto.cs deleted file mode 100644 index 631b97f4d..000000000 --- a/DiscImageChef.Gui/MainForm.xeto.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using Eto.Forms; -using Eto.Drawing; -using Eto.Serialization.Xaml; - -namespace DiscImageChef.Gui -{ - 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/DiscImageChef.Gui/frmMain.xeto b/DiscImageChef.Gui/frmMain.xeto new file mode 100644 index 000000000..8fb6dcfd4 --- /dev/null +++ b/DiscImageChef.Gui/frmMain.xeto @@ -0,0 +1,31 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/DiscImageChef.Gui/frmMain.xeto.cs b/DiscImageChef.Gui/frmMain.xeto.cs new file mode 100644 index 000000000..d39575ba6 --- /dev/null +++ b/DiscImageChef.Gui/frmMain.xeto.cs @@ -0,0 +1,83 @@ +using System; +using System.Linq; +using DiscImageChef.Devices; +using Eto.Forms; +using Eto.Serialization.Xaml; + +namespace DiscImageChef.Gui +{ + public class frmMain : Form + { + Splitter splMain; + TreeGridView treeImages; + TreeGridItemCollection treeImagesItems; + + public frmMain() + { + XamlReader.Load(this); + + treeImagesItems = new TreeGridItemCollection(); + + treeImages.Columns.Add(new GridColumn {HeaderText = "Name", DataCell = new TextBoxCell(0)}); + + treeImages.AllowMultipleSelection = false; + treeImages.ShowHeader = false; + treeImages.DataStore = treeImagesItems; + + imagesRoot = new TreeGridItem {Values = new object[] {"Images"}}; + devicesRoot = new TreeGridItem {Values = new object[] {"Devices"}}; + + treeImagesItems.Add(imagesRoot); + treeImagesItems.Add(devicesRoot); + } + + protected void OnMenuOpen(object sender, EventArgs e) + { + MessageBox.Show("Not yet implemented"); + } + + protected void OnMenuAbout(object sender, EventArgs e) + { + new AboutDialog().ShowDialog(this); + } + + protected void OnMenuQuit(object sender, EventArgs e) + { + Application.Instance.Quit(); + } + + protected void OnDeviceRefresh(object sender, EventArgs e) + { + RefreshDevices(); + } + + protected override void OnLoadComplete(EventArgs e) + { + base.OnLoadComplete(e); + + RefreshDevices(); + } + + void RefreshDevices() + { + devicesRoot.Children.Clear(); + + foreach(DeviceInfo device in Device.ListDevices().Where(d => d.Supported).OrderBy(d => d.Vendor) + .ThenBy(d => d.Model)) + { + devicesRoot.Children.Add(new TreeGridItem + { + Values = new object[] {$"{device.Vendor} {device.Model} ({device.Bus})", device.Path} + }); + } + + treeImages.ReloadData(); + } + + #region XAML IDs + TreeGridItem devicesRoot; + GridView grdFiles; + TreeGridItem imagesRoot; + #endregion + } +} \ No newline at end of file diff --git a/DiscImageChef/Main.cs b/DiscImageChef/Main.cs index 0dbe96490..80d2c3a4a 100644 --- a/DiscImageChef/Main.cs +++ b/DiscImageChef/Main.cs @@ -210,7 +210,7 @@ namespace DiscImageChef { if (opts.Debug) DicConsole.DebugWriteLineEvent += System.Console.Error.WriteLine; if (opts.Verbose) DicConsole.VerboseWriteLineEvent += System.Console.WriteLine; - new Application(Eto.Platform.Detect).Run(new MainForm()); + new Application(Eto.Platform.Detect).Run(new frmMain()); }).WithNotParsed(errs => Environment.Exit(1)); Statistics.SaveStats();