diff --git a/out/production/sae2.01-developpement-application/.gitignore b/out/production/sae2.01-developpement-application/.gitignore index ce1004daa0b5a82475c2554a7a3d40fd1b9fbb0f..b4bbfb439994f80a812f99104a220c2249c3e159 100644 --- a/out/production/sae2.01-developpement-application/.gitignore +++ b/out/production/sae2.01-developpement-application/.gitignore @@ -1,3 +1,3 @@ .idea -.out +out sae2.01-developpement-application.iml \ No newline at end of file diff --git a/shukan/Shukan.java b/shukan/Shukan.java index c174e9e18f689ce6212b338cccaeab7ed66be30b..39be6bfc847abda316b35bb722ff79cbce301f45 100644 --- a/shukan/Shukan.java +++ b/shukan/Shukan.java @@ -29,6 +29,7 @@ public class Shukan ShukanData data = new ShukanData (); ShukanIO io = new ShukanIO (data); + // Handling edition mode if (args.length > 0) if (args[0].equals ("edit")) @@ -40,6 +41,7 @@ public class Shukan // Creating Shukan viewer JFrame frame = new JFrame ("SHUKAN 1.6"); ShukanView canvas = new ShukanView (data, io); + ShukanViewBar barre = new ShukanViewBar(io, data); // Getting the display size GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment (); @@ -66,6 +68,7 @@ public class Shukan } }); + // Setting the window geometry frame.add (canvas); Insets ins = frame.getInsets (); diff --git a/shukan/ShukanViewBar.java b/shukan/ShukanViewBar.java index 4592e6e28bc2466433af6251ec0c2c71e4b3ffc9..3d2e647ef9739802d500495a89050bfffa54ecc9 100644 --- a/shukan/ShukanViewBar.java +++ b/shukan/ShukanViewBar.java @@ -1,13 +1,17 @@ package shukan; +import javax.imageio.ImageIO; import javax.swing.*; import java.awt.*; +import java.io.File; public class ShukanViewBar extends JPanel { /** File manager */ private ShukanIO myIO = null; /** Displayed data */ private ShukanData data = null; + private String[] imagesName = {"save", "back", "plus", "delete", "left", "right", "export", "parameter"}; + private String imagesExtension = ".png"; public ShukanViewBar(ShukanIO myIO, ShukanData data){ this.myIO = myIO; @@ -15,9 +19,31 @@ public class ShukanViewBar extends JPanel { } @Override - public void paintComponents(Graphics g) { - + public void paintComponent(Graphics g) { + super.paintComponents(g); + setSize(getWidth(), 80); + // load images + try{ + for(int i = 0; i<imagesName.length; i++){ + Image im = ImageIO.read(new File("data/images/"+imagesName[i]+imagesExtension)); + g.drawImage(im, i*(100), 0, this); + } + } + catch(Exception e){System.out.println("Image manquante");} } - + public static void main(String args[]){ + ShukanData data = new ShukanData (); + ShukanIO io = new ShukanIO (data); + EventQueue.invokeLater(new Runnable() { + public void run() { + JFrame f = new JFrame("esssai"); + ShukanViewBar s = new ShukanViewBar (io,data); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.add(s); + f.pack(); + f.setVisible(true); + } + }); + } }