diff --git a/src/rars/venus/MainPane.java b/src/rars/venus/MainPane.java index 3f0de9f7..62196add 100644 --- a/src/rars/venus/MainPane.java +++ b/src/rars/venus/MainPane.java @@ -62,22 +62,24 @@ public MainPane(VenusUI appFrame, Editor editor, RegistersWindow regs, FloatingPointWindow cop1Regs, ControlAndStatusWindow cop0Regs) { super(); this.mainUI = appFrame; + this.setTabPlacement(JTabbedPane.TOP); //LEFT); if (this.getUI() instanceof BasicTabbedPaneUI) { BasicTabbedPaneUI ui = (BasicTabbedPaneUI) this.getUI(); } editTabbedPane = new EditTabbedPane(appFrame, editor, this); executeTab = new ExecutePane(appFrame, regs, cop1Regs, cop0Regs); - //String editTabTitle = "Edit"; - String editTabTitle = "

Edit

"; - //"
 
E
d
i
t
 
"; - //String executeTabTitle = "Execute"; //"
 
E
x
e
c
u
t
e
 
"; - String executeTabTitle = "

Execute

"; + String editTabTitle = "Edit"; + //String editTabTitle = "

Edit

"; + //"
 
E
d
i
t
 
"; + String executeTabTitle = "Execute"; //"
 
E
x
e
c
u
t
e
 
"; + //String executeTabTitle = "

Execute

"; Icon editTabIcon = null;//new ImageIcon(Toolkit.getDefaultToolkit().getImage(this.getClass().getResource(Globals.imagesPath+"Edit_tab.jpg"))); Icon executeTabIcon = null;//new ImageIcon(Toolkit.getDefaultToolkit().getImage(this.getClass().getResource(Globals.imagesPath+"Execute_tab.jpg"))); this.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT); this.addTab(editTabTitle, editTabIcon, editTabbedPane); + this.setForeground(Color.black); // this.addTab("
 
P
r
o
j
 
1", null, new JTabbedPane()); // this.addTab("
 
P
r
o
j
 
2", null, new JTabbedPane()); diff --git a/src/rars/venus/MessagesPane.java b/src/rars/venus/MessagesPane.java index dd0d6b33..7635c60b 100644 --- a/src/rars/venus/MessagesPane.java +++ b/src/rars/venus/MessagesPane.java @@ -170,8 +170,16 @@ public void actionPerformed(ActionEvent e) { runTab.add(createBoxForButton(runTabClearButton), BorderLayout.WEST); runTab.add(new JScrollPane(run, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED), BorderLayout.CENTER); + + /* Bad HTML fix this.addTab("

Messages

", assembleTab); this.addTab("

Run I/O

", runTab); + */ + + this.addTab("Messages", assembleTab); + this.addTab("Run I/O", runTab); + this.setForeground(Color.BLACK); + this.setToolTipTextAt(0, "Messages produced by Run menu. Click on assemble error message to select erroneous line"); this.setToolTipTextAt(1, "Simulated console input and output"); } diff --git a/src/rars/venus/VenusUI.java b/src/rars/venus/VenusUI.java index a9f852ab..6b1f26e6 100644 --- a/src/rars/venus/VenusUI.java +++ b/src/rars/venus/VenusUI.java @@ -178,6 +178,8 @@ public VenusUI(String s) { mainPane = new MainPane(mainUI, editor, registersTab, fpTab, csrTab); //UIManager.put("TabbedPane.tabInsets", defaultTabInsets); + + mainPane.setPreferredSize(mainPanePreferredSize); messagesPane = new MessagesPane(); messagesPane.setPreferredSize(messagesPanePreferredSize); diff --git a/src/rars/venus/registers/RegistersPane.java b/src/rars/venus/registers/RegistersPane.java index 62f1966c..da588a96 100644 --- a/src/rars/venus/registers/RegistersPane.java +++ b/src/rars/venus/registers/RegistersPane.java @@ -3,6 +3,7 @@ import rars.venus.VenusUI; import javax.swing.*; +import java.awt.Color; /* Copyright (c) 2003-2006, Pete Sanderson and Kenneth Vollmar @@ -54,15 +55,26 @@ public RegistersPane(VenusUI appFrame, RegistersWindow regs, FloatingPointWindow ControlAndStatusWindow cop0) { super(); this.mainUI = appFrame; + regsTab = regs; fpTab = cop1; csrTab = cop0; regsTab.setVisible(true); fpTab.setVisible(true); csrTab.setVisible(true); + + /* Bad HTML Fix this.addTab("

Registers

", regsTab); this.addTab("

Floating Point

", fpTab); this.addTab("

Control and Status

", csrTab); + */ + + // Good code fix + this.addTab("Registers", regsTab); + this.addTab("Floating Point", fpTab); + this.addTab("Control and Status", csrTab); + this.setForeground(Color.black); + this.setToolTipTextAt(0, "CPU registers"); this.setToolTipTextAt(1, "Floating point unit registers"); this.setToolTipTextAt(2, "Control and Status registers");