Changeset 10701

Timestamp:

Apr 30, 2011, 3:18:37 PM (13 years ago)

Author:

mlg

Message:

Changes the look of the comment panels

Location:

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/comments

Files:

• CommentPanel.java (modified) (4 diffs)
• CommentsDialog.java (modified) (4 diffs)
• RoundedBorder.java (added)
• TopRoundedBorder.java (added)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/comments/CommentPanel.java

@@ -7 +7 @@
 import java.awt.Font;
 
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel;
 
 /**
@@ -58 +63 @@
         this.setBackground(color);
         JTextArea area = new JTextArea("\n\n\t" + text);
+        //trick : allows the area to be transparent
+        area.setBackground(new Color(0, 0, 0, 0));
+        area.setForeground(Color.WHITE);
         area.setFont(area.getFont().deriveFont(Font.BOLD));
         area.setPreferredSize(new Dimension(550, 100));
@@ -68 +76 @@
         panelHaut.setPreferredSize(new Dimension(550, 50));
         panelHaut.setOpaque(false);
+        panelHaut.setBackground(Color.white);
+        panelHaut.setBorder(new TopRoundedBorder(45));
         JLabel labelAuteur = new JLabel(auteur);
         JLabel labelDate = new JLabel(date);
@@ -73 +83 @@
         panelHaut.add(labelDate);
 
+        this.setBorder(new RoundedBorder(45));
+        this.setOpaque(false);
+
         this.add(panelHaut, BorderLayout.NORTH);
         this.add(area, BorderLayout.CENTER);
     }
 
+    //    @Override
+    //    public void paint(Graphics g) {
+    //  super.paint(g);
+    //  // TODO Auto-generated method stub
+    //  Graphics2D g2 = (Graphics2D) g;
+    //  try {
+    //      g2.drawImage(ImageIO.read(new File(
+    //              "/home/mael/workspace/jiwigo/src/main/resources/fr/mael/jiwigo/img/79e56b_top.png")), 0, 0, this);
+    //  } catch (IOException e) {
+    //      e.printStackTrace();
+    //  }
+    //
+    //    }
+
+    public static void main(String[] args) {
+
+        try {
+            UIManager.setLookAndFeel(new NimbusLookAndFeel());
+        } catch (UnsupportedLookAndFeelException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        JFrame frame = new JFrame();
+        //frame.add(new CommentPanel(new Color(20, 50, 110), "haha", "hihi", "date"));
+        frame.add(new CommentPanel(new Color(0, 153, 255), "haha", "hihi", "date"));
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+    }
 }

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/comments/CommentsDialog.java

@@ -24 +24 @@
 import fr.mael.jiwigo.transverse.util.spring.SpringUtils;
 import fr.mael.jiwigo.ui.browser.BrowserPanel;
+import fr.mael.jiwigo.ui.mainframe.MainFrame;
 
 /**
@@ -100 +101 @@
      */
     public CommentsDialog(BrowserPanel parent, Integer imageId) {
-        //      super(parent);
+        super(MainFrame.getInstance());
         this.imageId = imageId;
         this.setTitle(Messages.getMessage("commentaires"));
@@ -123 +124 @@
             List<Comment> commentsForImage = SpringUtils.getCommentService().list(imageId);
             GridBagConstraints c = new GridBagConstraints();
+
             c.insets = new Insets(3, 3, 3, 3);
             c.gridx = 0;
@@ -130 +132 @@
                 CommentPanel panel;
                 if (alternate) {
-                    panel = new CommentPanel(new Color(153, 204, 51), comment.getContent(), comment.getAuthor(),
+                    panel = new CommentPanel(new Color(0, 153, 255), comment.getContent(), comment.getAuthor(),
                             comment.getDate());
                 } else {
-                    panel = new CommentPanel(new Color(77, 204, 51), comment.getContent(), comment.getAuthor(),
+                    panel = new CommentPanel(new Color(20, 50, 110), comment.getContent(), comment.getAuthor(),
                             comment.getDate());
                 }