github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Swapped main menu position of Feedback and Preferences (so Preferences is always available if you switch to a too big font size).

Browse source
This commit is contained in:
LevelX2 2016-05-29 09:53:56 +02:00
parent 0085b6b1ef
commit 9fa0bf7bd2
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Mage.Client/src/main/java/mage/client/MageFrame.form
View file

@ -76,15 +76,15 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBoxLayout"/>
<SubComponents> <SubComponents>
<Component class="javax.swing.JButton" name="btnSendFeedback"> <Component class="javax.swing.JButton" name="btnPreferences">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="Feedback"/> <Property name="text" type="java.lang.String" value="Preferences"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="0"/> <Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="verticalTextPosition" type="int" value="3"/> <Property name="verticalTextPosition" type="int" value="3"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSendFeedbackActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnPreferencesActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparator4"> <Component class="javax.swing.JToolBar$Separator" name="jSeparator4">
@ -141,15 +141,15 @@
</Component> </Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparator5"> <Component class="javax.swing.JToolBar$Separator" name="jSeparator5">
</Component> </Component>
<Component class="javax.swing.JButton" name="btnPreferences"> <Component class="javax.swing.JButton" name="btnSendFeedback">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="Preferences"/> <Property name="text" type="java.lang.String" value="Feedback"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="0"/> <Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="verticalTextPosition" type="int" value="3"/> <Property name="verticalTextPosition" type="int" value="3"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnPreferencesActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSendFeedbackActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparator6"> <Component class="javax.swing.JToolBar$Separator" name="jSeparator6">

36
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -823,7 +823,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
desktopPane = new MageJDesktop(); desktopPane = new MageJDesktop();
mageToolbar = new javax.swing.JToolBar(); mageToolbar = new javax.swing.JToolBar();
btnSendFeedback = new javax.swing.JButton(); btnPreferences = new javax.swing.JButton();
jSeparator4 = new javax.swing.JToolBar.Separator(); jSeparator4 = new javax.swing.JToolBar.Separator();
btnConnect = new javax.swing.JButton(); btnConnect = new javax.swing.JButton();
jSeparator3 = new javax.swing.JToolBar.Separator(); jSeparator3 = new javax.swing.JToolBar.Separator();
@ -833,7 +833,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
jSeparator2 = new javax.swing.JToolBar.Separator(); jSeparator2 = new javax.swing.JToolBar.Separator();
btnCollectionViewer = new javax.swing.JButton(); btnCollectionViewer = new javax.swing.JButton();
jSeparator5 = new javax.swing.JToolBar.Separator(); jSeparator5 = new javax.swing.JToolBar.Separator();
btnPreferences = new javax.swing.JButton(); btnSendFeedback = new javax.swing.JButton();
jSeparator6 = new javax.swing.JToolBar.Separator(); jSeparator6 = new javax.swing.JToolBar.Separator();
btnAbout = new javax.swing.JButton(); btnAbout = new javax.swing.JButton();
jSeparator7 = new javax.swing.JToolBar.Separator(); jSeparator7 = new javax.swing.JToolBar.Separator();
@ -854,16 +854,16 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
mageToolbar.setMinimumSize(new java.awt.Dimension(566, 60)); mageToolbar.setMinimumSize(new java.awt.Dimension(566, 60));
mageToolbar.setPreferredSize(new java.awt.Dimension(614, 60)); mageToolbar.setPreferredSize(new java.awt.Dimension(614, 60));
btnSendFeedback.setText("Feedback"); btnPreferences.setText("Preferences");
btnSendFeedback.setFocusable(false); btnPreferences.setFocusable(false);
btnSendFeedback.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnPreferences.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnSendFeedback.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnPreferences.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
btnSendFeedback.addActionListener(new java.awt.event.ActionListener() { btnPreferences.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
btnSendFeedbackActionPerformed(evt); btnPreferencesActionPerformed(evt);
} }
}); });
mageToolbar.add(btnSendFeedback); mageToolbar.add(btnPreferences);
mageToolbar.add(jSeparator4); mageToolbar.add(jSeparator4);
btnConnect.setText("Connect"); btnConnect.setText("Connect");
@ -914,16 +914,16 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
mageToolbar.add(btnCollectionViewer); mageToolbar.add(btnCollectionViewer);
mageToolbar.add(jSeparator5); mageToolbar.add(jSeparator5);
btnPreferences.setText("Preferences"); btnSendFeedback.setText("Feedback");
btnPreferences.setFocusable(false); btnSendFeedback.setFocusable(false);
btnPreferences.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); btnSendFeedback.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
btnPreferences.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnSendFeedback.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
btnPreferences.addActionListener(new java.awt.event.ActionListener() { btnSendFeedback.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
btnPreferencesActionPerformed(evt); btnSendFeedbackActionPerformed(evt);
} }
}); });
mageToolbar.add(btnPreferences); mageToolbar.add(btnSendFeedback);
mageToolbar.add(jSeparator6); mageToolbar.add(jSeparator6);
btnAbout.setText("About"); btnAbout.setText("About");
@ -1069,9 +1069,11 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
if (setActive) { if (setActive) {
setActive(tablesPane); setActive(tablesPane);
} else // if other panel was already shown, mamke sure it's topmost again } else // if other panel was already shown, mamke sure it's topmost again
if (topPanebefore != null) { {
if (topPanebefore != null) {
setActive(topPanebefore); setActive(topPanebefore);
} }
}
} }
public void hideGames() { public void hideGames() {