← Back to branch summary

~tapaal-developers/tapaal/1.3

« back to all changes in this revision

Viewing changes to pipe/gui/GuiFrame.java

  • Committer: Kenneth Yrke Jørgensen
  • Date: 2010-05-07 13:58:27 UTC
  • Revision ID: mail@yrke.dk-20100507135827-j4bst3z2x3ft9j2g
Changed login in toolbar, there are now a toolbar and an drawing toolbar, layouted using a flowlayout. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
pipe/gui/GuiFrame.java
2
2
 
3
3
import java.awt.BorderLayout;
4
4
import java.awt.Component;
 
5
import java.awt.Container;
5
6
import java.awt.Dimension;
 
7
import java.awt.FlowLayout;
 
8
import java.awt.GridBagConstraints;
 
9
import java.awt.GridBagLayout;
 
10
import java.awt.GridLayout;
 
11
import java.awt.Panel;
6
12
import java.awt.Rectangle;
7
13
import java.awt.Toolkit;
8
14
import java.awt.event.ActionEvent;
23
29
import java.util.jar.JarFile;
24
30
 
25
31
import javax.swing.Action;
 
32
import javax.swing.Box;
 
33
import javax.swing.BoxLayout;
26
34
import javax.swing.ImageIcon;
27
35
import javax.swing.JComboBox;
28
36
import javax.swing.JComponent;
31
39
import javax.swing.JMenuBar;
32
40
import javax.swing.JMenuItem;
33
41
import javax.swing.JOptionPane;
 
42
import javax.swing.JRootPane;
34
43
import javax.swing.JScrollPane;
35
44
import javax.swing.JTabbedPane;
36
45
import javax.swing.JToggleButton;
558
567
                toolBar.add(new ToggleButton(startAction));
559
568
 
560
569
                //Start drawingToolBar
 
570
                toolBar.addSeparator();
561
571
                drawingToolBar = new JToolBar();
562
572
                drawingToolBar.setFloatable(false);
563
573
 
564
574
                //Normal arraw
565
 
                drawingToolBar.addSeparator();
566
575
                drawingToolBar.add(new ToggleButton(selectAction));
567
576
                
568
577
                //Drawing elements
580
589
 
581
590
                //Add drawingtoolbar to toolbar
582
591
                drawingToolBar.addSeparator();
583
 
                toolBar.add(drawingToolBar);
584
 
 
585
 
                for(int i=0;i<toolBar.getComponentCount();i++){
586
 
                        toolBar.getComponent(i).setFocusable(false);
587
 
                }
588
 
 
589
 
                getContentPane().add(toolBar,BorderLayout.PAGE_START);
 
592
                //toolBar.add(drawingToolBar);
 
593
                
 
594
                
 
595
                Panel toolBarPanel = new Panel();
 
596
                toolBarPanel.setLayout(new FlowLayout(0,0,0));
 
597
 
 
598
                toolBarPanel.add(toolBar);
 
599
                toolBarPanel.add(drawingToolBar);
 
600
                toolBarPanel.add(Box.createHorizontalGlue());
 
601
                        
 
602
                getContentPane().add(toolBarPanel,BorderLayout.PAGE_START);
590
603
        }
591
604
 
592
605
        /**