Skip to content

Commit ea4e71d

Browse files
committed
Revert "Move options and actions to a menu bar; Yay."
This reverts commit 9accc47. It seems like this looks really bad on OS X so we need to back this change out for now.
1 parent 3d93f36 commit ea4e71d

File tree

1 file changed

+7
-32
lines changed

1 file changed

+7
-32
lines changed

src/com/ggtracker/uploader/MainFrame.java

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
import java.awt.Color;
1414
import java.awt.FlowLayout;
1515
import java.awt.Frame;
16-
import java.awt.Menu;
17-
import java.awt.MenuBar;
18-
import java.awt.MenuItem;
1916
import java.awt.event.ActionEvent;
2017
import java.awt.event.ActionListener;
2118
import java.awt.event.WindowAdapter;
@@ -158,40 +155,18 @@ public void actionPerformed( final ActionEvent event ) {
158155
contentBox.add( wrapper );
159156

160157
// ACTIONS
161-
MenuBar menubar = new MenuBar();
162-
Menu file = new Menu("File");
163-
MenuItem replays = new MenuItem("View Replays");
164-
MenuItem logs = new MenuItem("View Logs");
165-
MenuItem exit = new MenuItem("Exit");
166-
exit.addActionListener( new ActionListener() {
158+
159+
contentBox.add( Box.createVerticalStrut( SPACING ) );
160+
wrapper = new JPanel( new FlowLayout( FlowLayout.RIGHT, 0, 0 ) );
161+
final JButton exitButton = new JButton( "Quit and Stop Uploading Replays" );
162+
exitButton.addActionListener( new ActionListener() {
167163
@Override
168164
public void actionPerformed( final ActionEvent event ) {
169165
GgtrackerUploader.exit();
170166
}
171167
} );
172-
file.add(replays);
173-
file.add(logs);
174-
file.add(exit);
175-
176-
Menu help = new Menu("Help");
177-
MenuItem faq = new MenuItem("Online Help");
178-
help.add(faq);
179-
180-
menubar.add(file);
181-
menubar.add(help);
182-
setMenuBar(menubar);
183-
184-
contentBox.add( Box.createVerticalStrut( SPACING ) );
185-
wrapper = new JPanel( new FlowLayout( FlowLayout.RIGHT, 0, 0 ) );
186-
// final JButton exitButton = new JButton( "Quit and Stop Uploading Replays" );
187-
// exitButton.addActionListener( new ActionListener() {
188-
// @Override
189-
// public void actionPerformed( final ActionEvent event ) {
190-
// GgtrackerUploader.exit();
191-
// }
192-
// } );
193-
// wrapper.add( exitButton );
194-
// wrapper.add( Box.createHorizontalStrut( 3 ) );
168+
wrapper.add( exitButton );
169+
wrapper.add( Box.createHorizontalStrut( 3 ) );
195170
wrapper.add( Utils.createLinkLabel( Consts.APP_VERSION, Consts.URL_HOME_PAGE ) );
196171
contentBox.add( wrapper );
197172

0 commit comments

Comments
 (0)