Avans/MusicPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge gui into dev

Browse Source
This commit is contained in:
Yorick Rommers
2015-10-29 19:43:45 +01:00
parent 8e51cfad07 5491f1d165
commit 2de025edf7
5 changed files with 110 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MusicPlayer/MusicPlayer/MainForm.Designer.cs
Generated
+30 -21
View File
@@ -28,7 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.SongsTable = new System.Windows.Forms.DataGridView();
this.SongsTableView = new System.Windows.Forms.DataGridView();
this.GenreListBox = new System.Windows.Forms.ListBox();
this.AlbumListView = new System.Windows.Forms.ListView();
this.ArtistListBox = new System.Windows.Forms.ListBox();
@@ -37,24 +37,29 @@
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.SongsTable)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.SongsTableView)).BeginInit();
this.MainPanel.SuspendLayout();
this.MenuStrip.SuspendLayout();
this.SuspendLayout();
//
// SongsTable
// SongsTableView
//
this.SongsTable.AllowUserToAddRows = false;
this.SongsTable.AllowUserToDeleteRows = false;
this.SongsTable.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
this.SongsTableView.AllowUserToAddRows = false;
this.SongsTableView.AllowUserToDeleteRows = false;
this.SongsTableView.AllowUserToResizeRows = false;
this.SongsTableView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.SongsTable.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.SongsTable.Location = new System.Drawing.Point(12, 153);
this.SongsTable.Name = "SongsTable";
this.SongsTable.ReadOnly = true;
this.SongsTable.Size = new System.Drawing.Size(784, 182);
this.SongsTable.TabIndex = 0;
this.SongsTableView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.SongsTableView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.SongsTableView.Location = new System.Drawing.Point(12, 153);
this.SongsTableView.MultiSelect = false;
this.SongsTableView.Name = "SongsTableView";
this.SongsTableView.ReadOnly = true;
this.SongsTableView.RowHeadersVisible = false;
this.SongsTableView.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.SongsTableView.Size = new System.Drawing.Size(760, 172);
this.SongsTableView.TabIndex = 0;
//
// GenreListBox
//
@@ -62,6 +67,7 @@
this.GenreListBox.Location = new System.Drawing.Point(12, 12);
this.GenreListBox.Name = "GenreListBox";
this.GenreListBox.Size = new System.Drawing.Size(124, 134);
this.GenreListBox.Sorted = true;
this.GenreListBox.TabIndex = 1;
//
// AlbumListView
@@ -70,7 +76,8 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.AlbumListView.Location = new System.Drawing.Point(272, 12);
this.AlbumListView.Name = "AlbumListView";
this.AlbumListView.Size = new System.Drawing.Size(524, 134);
this.AlbumListView.Size = new System.Drawing.Size(500, 134);
this.AlbumListView.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.AlbumListView.TabIndex = 2;
this.AlbumListView.UseCompatibleStateImageBehavior = false;
//
@@ -80,6 +87,7 @@
this.ArtistListBox.Location = new System.Drawing.Point(142, 12);
this.ArtistListBox.Name = "ArtistListBox";
this.ArtistListBox.Size = new System.Drawing.Size(124, 134);
this.ArtistListBox.Sorted = true;
this.ArtistListBox.TabIndex = 3;
//
// MainPanel
@@ -87,11 +95,11 @@
this.MainPanel.Controls.Add(this.GenreListBox);
this.MainPanel.Controls.Add(this.ArtistListBox);
this.MainPanel.Controls.Add(this.AlbumListView);
this.MainPanel.Controls.Add(this.SongsTable);
this.MainPanel.Controls.Add(this.SongsTableView);
this.MainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.MainPanel.Location = new System.Drawing.Point(0, 24);
this.MainPanel.Name = "MainPanel";
this.MainPanel.Size = new System.Drawing.Size(808, 347);
this.MainPanel.Size = new System.Drawing.Size(784, 337);
this.MainPanel.TabIndex = 5;
//
// MenuStrip
@@ -100,7 +108,7 @@
this.fileToolStripMenuItem});
this.MenuStrip.Location = new System.Drawing.Point(0, 0);
this.MenuStrip.Name = "MenuStrip";
this.MenuStrip.Size = new System.Drawing.Size(808, 24);
this.MenuStrip.Size = new System.Drawing.Size(784, 24);
this.MenuStrip.TabIndex = 6;
this.MenuStrip.Text = "Menu";
//
@@ -116,26 +124,27 @@
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.openToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
this.openToolStripMenuItem.Text = "Open";
//
// saveToolStripMenuItem
//
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
this.saveToolStripMenuItem.Text = "Save";
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(808, 371);
this.ClientSize = new System.Drawing.Size(784, 361);
this.Controls.Add(this.MainPanel);
this.Controls.Add(this.MenuStrip);
this.MainMenuStrip = this.MenuStrip;
this.MinimumSize = new System.Drawing.Size(800, 400);
this.Name = "MainForm";
this.Text = "YJMPD Music Player";
((System.ComponentModel.ISupportInitialize)(this.SongsTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.SongsTableView)).EndInit();
this.MainPanel.ResumeLayout(false);
this.MenuStrip.ResumeLayout(false);
this.MenuStrip.PerformLayout();
@@ -146,7 +155,7 @@
#endregion
private System.Windows.Forms.DataGridView SongsTable;
private System.Windows.Forms.DataGridView SongsTableView;
private System.Windows.Forms.ListBox GenreListBox;
private System.Windows.Forms.ListView AlbumListView;
private System.Windows.Forms.ListBox ArtistListBox;
MusicPlayer/MusicPlayer/MainForm.cs
+26
View File
@@ -13,6 +13,8 @@ namespace MusicPlayer
{
public partial class MainForm : Form
{
private SongsTable table;
public MainForm()
{
InitializeComponent();
@@ -22,7 +24,31 @@ namespace MusicPlayer
private void Form1_Load(object sender, EventArgs e)
{
//APIHandler api = new APIHandler();
//NetworkHandler nw = new NetworkHandler("83.128.250.123", api);
table = new SongsTable();
SongsTableView.DataSource = table;
Populate();
}
private void Populate()
{
table.Add(new Song("Test Song 1", "Test Album 1", "Test Artist 1"));
GenreListBox.Items.Add("Hardcore");
GenreListBox.Items.Add("Hardstyle");
GenreListBox.Items.Add("Pop");
ArtistListBox.Items.Add("Kygo");
ArtistListBox.Items.Add("Monstercat");
ArtistListBox.Items.Add("Mozart");
AlbumListView.Items.Add("Album 1");
AlbumListView.Items.Add("Album 2");
AlbumListView.Items.Add("Album 3");
table.Add(new Song("Test Song 2", "Test Album 2", "Test Artist 2"));
}
}
}
MusicPlayer/MusicPlayer/MusicPlayer.csproj
+6 -2
View File
@@ -58,8 +58,12 @@
<Compile Include="NetworkHandler.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
<Compile Include="Song.cs" />
<Compile Include="SongsTable.cs">
<SubType>Component</SubType>
</Compile>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
MusicPlayer/MusicPlayer/Song.cs
+22
View File
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MusicPlayer
{
class Song
{
public string Name { get; set; }
public string Album { get; set; }
public string Artist { get; set; }
public Song(string name, string album, string artist)
{
Name = name;
Album = album;
Artist = artist;
}
}
}
MusicPlayer/MusicPlayer/SongsTable.cs
+26
View File
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MusicPlayer
{
class SongsTable : DataTable
{
public SongsTable() : base()
{
this.Columns.Clear();
this.Columns.Add("Naam", typeof(string));
this.Columns.Add("Album", typeof(string));
this.Columns.Add("Artiest", typeof(string));
}
public void Add(Song s)
{
this.Rows.Add(s.Name, s.Album, s.Artist);
}
}
}