Переглянути джерело

Added InfoField class and better left row

Supermaniac101 10 роки тому
батько
коміт
a66641c209

+ 13 - 0
src/gui/panels/agenda/InfoField.java

@@ -0,0 +1,13 @@
+package gui.panels.agenda;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.border.TitledBorder;
+
+@SuppressWarnings("serial")
+public class InfoField extends JPanel {
+	public InfoField(String title, String text){
+		this.add(new JLabel(text));
+		this.setBorder(new TitledBorder(title));
+	}
+}

+ 30 - 16
src/gui/panels/agenda/InfoPane.java

@@ -1,33 +1,47 @@
 package gui.panels.agenda;
 
 import java.awt.Color;
-import java.awt.GridLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
 
-import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JTextPane;
 import javax.swing.border.LineBorder;
 
 @SuppressWarnings("serial")
 public class InfoPane extends JPanel{
 	public InfoPane(){
-		this.setLayout(new GridLayout(6,3,30,60));
 		this.setBorder(new LineBorder(new Color(0, 0, 0), 1, true));
-		label();
-		textField();
+		this.setLayout(new GridBagLayout());
+		
+		upperText();
+		middleText();
 	}
 	
-	public void label(){
-		JLabel info = new JLabel("Information");
-		this.add(info);
-
+	public void upperText(){
+		InfoField upperPanel = new InfoField("Info upper","Blablablabla blablabla");
+		GridBagConstraints c = new GridBagConstraints();
+        c.fill = GridBagConstraints.HORIZONTAL;
+        c.anchor = GridBagConstraints.NORTH;
+        c.insets = new Insets(0,20,0,20);
+        c.gridx = 2;
+        c.gridy = 0;
+        c.weightx = 1.0;
+        c.weighty = 0.0;   
+		this.add(upperPanel,c);
 	}
 	
-	public void textField(){
-		JTextPane infopane = new JTextPane();
-		infopane.setEditable(false);
-		infopane.setText("aaaaaa\r\nbbbbb\r\nccccc\r\nddddd\r\n");
-		this.add(infopane);
-		
+	public void middleText(){
+		InfoField middlePanel = new InfoField("Info mid","Blablablabla");
+		GridBagConstraints c = new GridBagConstraints();
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.BOTH;
+		c.insets = new Insets(0,20,0,20);
+		c.gridx = 2;
+        c.gridy = 1;    
+        c.weightx = 1.0;
+        c.weighty = 1.0;        
+
+		this.add(middlePanel,c);
 	}
 }

+ 8 - 8
src/gui/panels/edit/EditPane.java

@@ -1,14 +1,14 @@
 package gui.panels.edit;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.GridLayout;
+import java.awt.Label;
+
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
 import agenda.Agenda;
-import agenda.Artist;
-import com.sun.istack.internal.NotNull;
-import javafx.scene.layout.VBox;
-
-import javax.swing.*;
-import javax.swing.border.Border;
-import java.awt.*;
-import java.util.ArrayList;
 
 /**
  * Created by gjoosen on 13/02/15.