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

Timestamp:

Sep 19, 2010, 11:40:53 PM (14 years ago)

Author:

mlg

Message:

New feature : research
Add a research functionnality : it's juste a field on the bottom right of the main frame. To make a research, the user have to type text in that field and press enter. It opens a new tab. A new tab is opened for each research. The tab contains the query string.

File:

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

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.util.HashMap;
 
@@ -22 +24 @@
 import fr.mael.jiwigo.transverse.util.Messages;
 import fr.mael.jiwigo.transverse.util.Outil;
+import fr.mael.jiwigo.ui.field.HintTextField;
 import fr.mael.jiwigo.ui.mainframe.tab.JTabbedPaneWithCloseIcons;
 
@@ -53 +56 @@
  * Frame principale
  */
-public class MainFrame extends JFrame implements ActionListener {
+public class MainFrame extends JFrame implements ActionListener, KeyListener {
     /**
      * Logger
@@ -106 +109 @@
 
     private HashMap<Integer, Integer> mapsIdPos = new HashMap<Integer, Integer>();
+
+    private HintTextField fieldSearch;
 
     /**
@@ -129 +134 @@
         categoriesTree = new CategoriesTree();
         splitPane.setLeftComponent(categoriesTree);
-        //      imagesPanel = new ThumbnailCategoryPanel(null);
-        //      reduceSizeOfComponent(imagesPanel);
-        //      scrollPaneImagesPanel = new JScrollPane(imagesPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-        //              JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        //      scrollPaneImagesPanel.setPreferredSize(new Dimension(900, 600));
 
         tabbedPane = new JTabbedPaneWithCloseIcons();
-        //      tabbedPane.add(scrollPaneImagesPanel);
         splitPane.setRightComponent(tabbedPane);
 
         this.add(splitPane, BorderLayout.CENTER);
+        JPanel panelBas = new JPanel(new BorderLayout());
         JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
         progressBar = new JProgressBar(0, 100);
         panel.add(progressBar);
         panel.add(labelMessage);
+        panelBas.add(panel, BorderLayout.WEST);
+
+        fieldSearch = new HintTextField(Messages.getMessage("mainFrame_recherche"));
+        fieldSearch.setPreferredSize(new Dimension(150, 25));
+        fieldSearch.addKeyListener(this);
+        panelBas.add(fieldSearch, BorderLayout.EAST);
 
         jMenuEdition = new JMenu(Messages.getMessage("mainFrame_editionMenu"));
@@ -152 +158 @@
 
         this.setJMenuBar(jMenuBar);
-        this.add(panel, BorderLayout.SOUTH);
-        //      this.pack();
+        this.add(panelBas, BorderLayout.SOUTH);
         this.setSize(900, 600);
         this.setLocationRelativeTo(null);
@@ -160 +165 @@
     }
 
-    public void addTabb(ThumbnailCategoryPanel panel) {
-        JScrollPane scrollPaneImagesPanel = new JScrollPane(panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+    public void addTabb(IThumbnailPanel panel) {
+        JScrollPane scrollPaneImagesPanel = new JScrollPane((JPanel) panel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                 JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         scrollPaneImagesPanel.setPreferredSize(new Dimension(900, 600));
         boolean found = false;
+        boolean isSearch = false;
+        if (panel instanceof ThumbnailSearchPanel) {
+            isSearch = true;
+        }
         for (int i = 0; i < tabbedPane.getTabCount(); i++) {
             JScrollPane scroll = (JScrollPane) tabbedPane.getComponentAt(i);
-            ThumbnailCategoryPanel thumbPan = (ThumbnailCategoryPanel) scroll.getViewport().getComponents()[0];
+            IThumbnailPanel thumbPan = (IThumbnailPanel) scroll.getViewport().getComponents()[0];
             if (thumbPan.getCategory().getIdentifiant().equals(panel.getCategory().getIdentifiant())) {
-                tabbedPane.setSelectedIndex(i);
-                found = true;
-                break;
+                //only if it's not for a re
+                if (!(panel instanceof ThumbnailSearchPanel)) {
+                    tabbedPane.setSelectedIndex(i);
+                    found = true;
+                    break;
+                }
             }
         }
-        if (!found) {
+        //if it's not for a research, the title of the tab
+        //is the name of the category
+        if (!found && !isSearch) {
             tabbedPane.addTab(panel.getCategory().getNom(), scrollPaneImagesPanel, new ImageIcon(Outil
                     .getURL("fr/mael/jiwigo/img/closetab.png")));
-        }
-
-        //      if (mapsIdPos.get(panel.getCategory().getIdentifiant()) == null) {
-        //          tabbedPane.addTab(panel.getCategory().getNom(), scrollPaneImagesPanel);
-        //          mapsIdPos.put(panel.getCategory().getIdentifiant(), tabbedPane.getTabCount() - 1);
-        //      } else {
-        //          tabbedPane.setSelectedIndex(mapsIdPos.get(panel.getCategory().getIdentifiant()));
-        //      }
+            //if it's for a research, the title of the tab
+            //if the query string
+        } else if (!found && isSearch) {
+            String queryString = ((ThumbnailSearchPanel) panel).getQueryString();
+            tabbedPane.addTab(Messages.getMessage("mainFrame_search") + queryString, scrollPaneImagesPanel,
+                    new ImageIcon(Outil.getURL("fr/mael/jiwigo/img/closetab.png")));
+        }
 
     }
@@ -237 +250 @@
     }
 
+    @Override
+    public void keyPressed(KeyEvent paramKeyEvent) {
+        if (paramKeyEvent.getKeyCode() == KeyEvent.VK_ENTER) {
+            String queryString = fieldSearch.getText();
+            ThumbnailSearchPanel searchPanel = new ThumbnailSearchPanel(queryString);
+            addTabb(searchPanel);
+        }
+    }
+
+    @Override
+    public void keyReleased(KeyEvent paramKeyEvent) {
+    }
+
+    @Override
+    public void keyTyped(KeyEvent paramKeyEvent) {
+    }
+
 }