Textlabels for the toolbar

grendel/composition/CompositionPanel.java

@@ -33,6 +33,7 @@ import calypso.util.PreferencesFactory;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
+import java.awt.Dimension;
 import java.awt.FileDialog;
 import java.awt.Font;
 import java.awt.Frame;
@@ -864,21 +865,21 @@ public class CompositionPanel extends GeneralPanel {
     GrendelToolBar toolBar = new GrendelToolBar();
 
     addToolbarButton(toolBar, new SendNow(),
-                     "send",       "Send this message");
+                     "send",       "Send",     "Send this message");
     addToolbarButton(toolBar, new QuoteOriginalText(),
-                     "quote",      "Quote the previous document");
+                     "quote",      "Quote",    "Quote the previous document");
     addToolbarButton(toolBar, new SelectAddresses(),
-                     "address",    "Address this message");
+                     "address",    "Address",  "Address this message");
     addToolbarButton(toolBar, new AttachFile(),
-                     "attach",     "Include an attachment");
+                     "attach",     "Attach",   "Include an attachment");
     addToolbarButton(toolBar, null,
-                     "spelling",   "Check Spelling");
+                     "spelling",   "Spelling", "Check Spelling");
     addToolbarButton(toolBar, new SaveDraft(),
-                     "save",       "Save this message as a draft");
+                     "save",       "Save",     "Save this message as a draft");
     addToolbarButton(toolBar, null,
-                     "security",   "Show security Information");
+                     "security",   "Security", "Show security Information");
     addToolbarButton(toolBar, null,
-                     "stop",       "Stop the current Transfer (ESC)" );
+                     "stop",       "Stop",     "Stop the current Transfer (ESC)" );
     //addToolbarButton(toolBar, new AddSignatureAction(),
     //                 "signature",  "Add the signature of the current personality" );
 
@@ -897,6 +898,7 @@ public class CompositionPanel extends GeneralPanel {
   public void addToolbarButton(GrendelToolBar aToolBar,
                                UIAction aActionListener,
                                String aImageName,
+                               String aText,
                                String aToolTip) {
     JButton b = new JButton();
 
@@ -906,6 +908,10 @@ public class CompositionPanel extends GeneralPanel {
     b.setBorder(BorderFactory.createEmptyBorder());
     b.setMargin(new Insets(5,5,5,5));
     b.setToolTipText(aToolTip);
+    Font f=b.getFont();
+    Font nf=new Font(f.getName(), Font.PLAIN, f.getSize()-1);
+    b.setFont(nf);
+    b.setText(aText);
 
     URL iconUrl = getClass().getResource("images/" + aImageName + ".gif");
     b.setIcon(new ImageIcon(iconUrl));
@@ -922,6 +928,19 @@ public class CompositionPanel extends GeneralPanel {
                                      aImageName + "-rollover.gif");
     b.setRolloverIcon(new ImageIcon(iconUrl));
 
+    Dimension d=b.getPreferredSize();
+    System.out.println(d.getWidth());
+    System.out.println(d.getHeight());
+    double w=d.getWidth();
+    if (w > 48) {
+      d.setSize(w, 38);
+    } else {
+      d.setSize(48, 38);
+    }
+    b.setMinimumSize(d);
+    b.setMaximumSize(d);
+    b.setPreferredSize(d);
+
 
 //        JButton b = new JButton(new ImageIcon(aImageName));
 //      b.setToolTipText(aToolTip);

grendel/ui/GeneralPanel.java

@@ -29,6 +29,8 @@ import grendel.ui.ToolBarLayout;
 import grendel.widgets.GrendelToolBar;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Image;
 import java.awt.datatransfer.Clipboard;
 import java.util.Enumeration;
@@ -71,12 +73,33 @@ public class GeneralPanel extends JPanel {
     JButton res = new JButton();
 
     res.setIcon(icon);
+    res.setHorizontalTextPosition(JButton.CENTER);
+    res.setVerticalTextPosition(JButton.BOTTOM);
     res.setDisabledIcon(iconDisabled);
     res.setPressedIcon(iconPressed);
     res.setRolloverIcon(iconRollover);
     res.setActionCommand(aAction);
     res.setRolloverEnabled(true);
     res.setBorder(BorderFactory.createEmptyBorder());
+    Font f=res.getFont();
+    Font nf=new Font(f.getName(), Font.PLAIN, f.getSize()-1);
+    res.setFont(nf);
+    ResourceBundle resources = ResourceBundle.getBundle(fResourceBase + ".Toolbar");
+    String text = resources.getString(aAction);
+    res.setText(text);
+    
+    Dimension d=res.getPreferredSize();
+    System.out.println(d.getWidth());
+    System.out.println(d.getHeight());
+    double w=d.getWidth();
+    if (w > 48) {
+      d.setSize(w, 38);
+    } else {
+      d.setSize(48, 38);
+    }
+    res.setMinimumSize(d);
+    res.setMaximumSize(d);
+    res.setPreferredSize(d);
 
     return res;
   }

grendel/ui/Toolbar.properties

@@ -0,0 +1,9 @@
+msgGetNew=Get Msg
+msgNew=New Msg
+msgReply=Reply
+msgForward=Forward
+markAllRead=Mark Rd
+print=Print
+msgDelete=Delete
+stop=Stop
+