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

Edit toegevoegd aan infoframe

Browse Source 
Edit JButton toegevoegd bij zowel Artist als Event.
This commit is contained in:
aareschluchtje
2015-02-26 20:27:01 +01:00
parent 9739ead0df
commit 9ee421b792
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ArtistPanel.java
+21 -3
View File
@@ -1,9 +1,14 @@
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Font; import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.Box;
import javax.swing.BoxLayout; import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JSeparator; import javax.swing.JSeparator;
@@ -11,18 +16,31 @@ import javax.swing.SwingConstants;
public class ArtistPanel extends JPanel{ public class ArtistPanel extends JPanel{
public ArtistPanel(Event event) public ArtistPanel(Event event, Agenda a)
{ {
super(new BorderLayout()); super(new BorderLayout());
JLabel name = new JLabel(event.getArtist().getName()); JLabel name = new JLabel(event.getArtist().getName());
JButton edit = new JButton("Edit Info");
edit.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e)
{
EditArtistPanel editter = new EditArtistPanel(a, event.getArtist());
}
});
name.setFont(new Font("Dialog", Font.BOLD, 20)); name.setFont(new Font("Dialog", Font.BOLD, 20));
JLabel description = new JLabel("<html>" + " <b> Genre: </b> " + event.getArtist().getGenre() + "<br> <br> <b> Beschrijving </b> <br> <br>" + event.getArtist().getDescription() + " <br> <br> <b> achtergrondinfo </b> <br> <br>" + event.getArtist().getBackground() + "</html>"); JLabel description = new JLabel("<html>" + " <b> Genre: </b> " + event.getArtist().getGenre() + "<br> <br> <b> Beschrijving </b> <br> <br>" + event.getArtist().getDescription() + " <br> <br> <b> achtergrondinfo </b> <br> <br>" + event.getArtist().getBackground() + "</html>");
description.setFont(new Font("Dialog", Font.PLAIN, 12)); description.setFont(new Font("Dialog", Font.PLAIN, 12));
JPanel panel = new JPanel(); JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS)); panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
JPanel panel2 = new JPanel();
panel2.setLayout(new BoxLayout(panel2, BoxLayout.LINE_AXIS));
panel2.setAlignmentX(LEFT_ALIGNMENT);
JLabel photo = new JLabel(event.getArtist().getImage()); JLabel photo = new JLabel(event.getArtist().getImage());
panel.add(name); panel2.add(name);
panel2.add(Box.createRigidArea(new Dimension(10,0)));
panel2.add(edit);
panel.add(panel2);
panel.add(new JSeparator(SwingConstants.HORIZONTAL)); panel.add(new JSeparator(SwingConstants.HORIZONTAL));
add(photo, BorderLayout.EAST); add(photo, BorderLayout.EAST);
add(description, BorderLayout.CENTER); add(description, BorderLayout.CENTER);
EventPanel.java
+18 -2
View File
@@ -1,10 +1,15 @@
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.Font; import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import javax.swing.Box;
import javax.swing.BoxLayout; import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JSeparator; import javax.swing.JSeparator;
@@ -14,7 +19,7 @@ public class EventPanel extends JPanel{
private static final long serialVersionUID = 504733981352439417L; private static final long serialVersionUID = 504733981352439417L;
public EventPanel(Event event) public EventPanel(Event event, Agenda a)
{ {
super(new BorderLayout()); super(new BorderLayout());
SimpleDateFormat dateformatter = new SimpleDateFormat("dd-MM-yyyy"); SimpleDateFormat dateformatter = new SimpleDateFormat("dd-MM-yyyy");
@@ -28,8 +33,16 @@ public class EventPanel extends JPanel{
JPanel row = new JPanel(); JPanel row = new JPanel();
row.setLayout(new BoxLayout(row, BoxLayout.LINE_AXIS)); row.setLayout(new BoxLayout(row, BoxLayout.LINE_AXIS));
JPanel panel = new JPanel(); JPanel panel = new JPanel();
JButton edit = new JButton("Edit Info");
edit.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent e)
{
EditEventPanel edit = new EditEventPanel(a, event);
}
});
panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS)); panel.setLayout(new BoxLayout(panel, BoxLayout.PAGE_AXIS));
JLabel title = new JLabel("<html>" + event.getEventName() + "</html>"); JLabel title = new JLabel(event.getEventName());
JLabel date = new JLabel("<html>" + dateformatter.format(event.getEndDate().getTime()) + "</html>"); JLabel date = new JLabel("<html>" + dateformatter.format(event.getEndDate().getTime()) + "</html>");
JLabel data = new JLabel("<html> " + event.getStage().getName() + "<br> <br>" + event.getArtist().getName() + "<br> <br>" + event.getExpectedPopularity() + "<br> <br>" + timeformatter.format(event.getStartDate().getTime()) + " - " + timeformatter.format(event.getEndDate().getTime()) + "<br> <br> </html>"); JLabel data = new JLabel("<html> " + event.getStage().getName() + "<br> <br>" + event.getArtist().getName() + "<br> <br>" + event.getExpectedPopularity() + "<br> <br>" + timeformatter.format(event.getStartDate().getTime()) + " - " + timeformatter.format(event.getEndDate().getTime()) + "<br> <br> </html>");
JLabel text = new JLabel("<html> Podium: <br> <br> Artiest: <br> <br> Populariteit: <br> <br> Tijd: <br> <br> </html>"); JLabel text = new JLabel("<html> Podium: <br> <br> Artiest: <br> <br> Populariteit: <br> <br> Tijd: <br> <br> </html>");
@@ -43,6 +56,9 @@ public class EventPanel extends JPanel{
JLabel description = new JLabel("<html> <b> Beschrijving </b> <br> <br>" + event.getDescription() + "</html>"); JLabel description = new JLabel("<html> <b> Beschrijving </b> <br> <br>" + event.getDescription() + "</html>");
description.setFont(new Font("Dialog", Font.PLAIN, 12)); description.setFont(new Font("Dialog", Font.PLAIN, 12));
row.add(title); row.add(title);
row.add(Box.createRigidArea(new Dimension(10,0)));
row.add(edit);
row.add(Box.createRigidArea(new Dimension(30,0)));
row.add(date); row.add(date);
box1.add(row); box1.add(row);
box1.add(new JSeparator(SwingConstants.HORIZONTAL)); box1.add(new JSeparator(SwingConstants.HORIZONTAL));
TabbedPane.java
+2 -2
View File
@@ -10,8 +10,8 @@ public class TabbedPane extends JFrame{
{ {
super("info GUI"); super("info GUI");
JTabbedPane tab = new JTabbedPane(); JTabbedPane tab = new JTabbedPane();
tab.add("Event", new EventPanel(event)); tab.add("Event", new EventPanel(event, a));
tab.add("Artist", new ArtistPanel(event)); tab.add("Artist", new ArtistPanel(event, a));
if(eventSelected) if(eventSelected)
{ {
tab.setSelectedIndex(0); tab.setSelectedIndex(0);