Changeset 6831 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java

Timestamp:

Sep 1, 2010, 6:48:53 PM (14 years ago)

Author:

mlg

Message:

Bug correction :
bug:0001837 : there is now a default translation file (in english), so the application won't crash when a translation is not found
bug:0001833 : the accents are manage when creating a new category
bug:0001832 : on a right click on the categories list, the selection is now visible
bug:0001830 : there is no bug on refreshing the categories tree

Features :
feature:001828 : exif and iptc tags are kept after resizing an image
feature:001827 : pwg.images.addChunk is now fully used : images are split into chunks before being sent

Other features :

• The user can manage his preferences :

-The web images size
-The chunks size

• The user can save the login informations (url, login, password) /!\ in a plain text file !

File:

• extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java (modified) (7 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/MainFrame.java

@@ -3 +3 @@
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -42 +47 @@
  * Frame principale
  */
-public class MainFrame extends JFrame {
+public class MainFrame extends JFrame implements ActionListener {
     /**
      * Logger
@@ -60 +65 @@
      * Panel contenant les miniatures de la catégorie courante
      */
-    public static MiniaturesCategoryPanel imagesPanel;
+    public static ThumbnailCategoryPanel imagesPanel;
     /**
      *  Scrollpane contenant le panel ci dessus
@@ -69 +74 @@
      */
     private JLabel labelMessage;
+
+    /**
+     * Barre de menu
+     */
+    private JMenuBar jMenuBar;
+
+    /**
+     * Menu d'édition
+     */
+    private JMenu jMenuEdition;
+
+    /**
+     * menu des preferences
+     */
+    private JMenuItem jMenuItemPreferences;
 
     /**
@@ -92 +112 @@
         this.setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(Outil.getURL("fr/mael/jiwigo/img/icon.png")));
         this.setLayout(new BorderLayout());
+        jMenuBar = new JMenuBar();
         labelMessage = new JLabel(Messages.getMessage("welcomeMessage"));
         splitPane = new JSplitPane();
         categoriesTree = new CategoriesTree();
         splitPane.setLeftComponent(categoriesTree);
-        imagesPanel = new MiniaturesCategoryPanel(null);
+        imagesPanel = new ThumbnailCategoryPanel(null);
         scrollPaneImagesPanel = new JScrollPane(imagesPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                 JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
@@ -104 +125 @@
         JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
         panel.add(labelMessage);
+
+        jMenuEdition = new JMenu(Messages.getMessage("mainFrame_editionMenu"));
+        jMenuBar.add(jMenuEdition);
+        jMenuItemPreferences = new JMenuItem(Messages.getMessage("mainFrame_preferencesMenu"));
+        jMenuItemPreferences.addActionListener(this);
+        jMenuEdition.add(jMenuItemPreferences);
+
+        this.setJMenuBar(jMenuBar);
         this.add(panel, BorderLayout.SOUTH);
         this.pack();
@@ -134 +163 @@
     }
 
+    @Override
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource().equals(jMenuItemPreferences)) {
+            new PreferencesDialog(this);
+        }
+
+    }
+
 }