External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

GUI: combined symbols and images download menus in one, fixed menu colors on theme switch

Browse source
This commit is contained in:
Oleg Agafonov 2024-08-05 02:20:12 +04:00
parent 42ae6f0f7e
commit 76db1d3e65
2 changed files with 99 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,11 +26,35 @@
</MenuItem> </MenuItem>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPopupMenu" name="popupDownload">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
<Property name="useNullLayout" type="boolean" value="true"/>
</Layout>
<SubComponents>
<MenuItem class="javax.swing.JMenuItem" name="menuDownloadSymbols">
<Properties>
<Property name="text" type="java.lang.String" value="Download mana symbols"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="menuDownloadSymbolsActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="menuDownloadImages">
<Properties>
<Property name="text" type="java.lang.String" value="Download card images"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="menuDownloadImagesActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
</Container>
</NonVisualComponents> </NonVisualComponents>
<Properties> <Properties>
<Property name="defaultCloseOperation" type="int" value="0"/> <Property name="defaultCloseOperation" type="int" value="0"/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[1024, 768]"/> <Dimension value="[1000, 500]"/>
</Property> </Property>
</Properties> </Properties>
<SyntheticProperties> <SyntheticProperties>
@ -181,37 +205,21 @@
</Component> </Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparator6"> <Component class="javax.swing.JToolBar$Separator" name="jSeparator6">
</Component> </Component>
<Component class="javax.swing.JButton" name="btnSymbols"> <Component class="javax.swing.JButton" name="btnDownload">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/menu/symbol.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Symbols"/>
<Property name="toolTipText" type="java.lang.String" value="&lt;HTML&gt;Load the mana and other card symbols from the internet.&lt;br&gt;&#xa;Otherwise you only see the replacement sequence like {U} for blue mana symbol.&lt;br&gt;&#xa;You need to do that only once."/>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="4"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnSymbolsActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparatorSymbols">
</Component>
<Component class="javax.swing.JButton" name="btnImages">
<Properties> <Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/menu/images.png"/> <Image iconType="3" name="/menu/images.png"/>
</Property> </Property>
<Property name="text" type="java.lang.String" value="Images"/> <Property name="text" type="java.lang.String" value="Download"/>
<Property name="toolTipText" type="java.lang.String" value="&lt;HTML&gt;Load card images from external sources."/> <Property name="toolTipText" type="java.lang.String" value="Download cards images and mana symbols"/>
<Property name="focusable" type="boolean" value="false"/> <Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="4"/> <Property name="horizontalTextPosition" type="int" value="4"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnImagesActionPerformed"/> <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="btnDownloadMouseClicked"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparatorImages"> <Component class="javax.swing.JToolBar$Separator" name="jSeparatorSymbols">
</Component> </Component>
<Component class="javax.swing.JButton" name="btnAbout"> <Component class="javax.swing.JButton" name="btnAbout">
<Properties> <Properties>

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

@ -929,6 +929,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
popupDebug = new javax.swing.JPopupMenu(); popupDebug = new javax.swing.JPopupMenu();
menuDebugTestModalDialog = new javax.swing.JMenuItem(); menuDebugTestModalDialog = new javax.swing.JMenuItem();
menuDebugTestCardRenderModesDialog = new javax.swing.JMenuItem(); menuDebugTestCardRenderModesDialog = new javax.swing.JMenuItem();
popupDownload = new javax.swing.JPopupMenu();
menuDownloadSymbols = new javax.swing.JMenuItem();
menuDownloadImages = new javax.swing.JMenuItem();
desktopPane = new MageJDesktop(); desktopPane = new MageJDesktop();
mageToolbar = new javax.swing.JToolBar(); mageToolbar = new javax.swing.JToolBar();
btnPreferences = new javax.swing.JButton(); btnPreferences = new javax.swing.JButton();
@ -941,10 +944,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
jSeparator5 = new javax.swing.JToolBar.Separator(); jSeparator5 = new javax.swing.JToolBar.Separator();
btnSendFeedback = new javax.swing.JButton(); btnSendFeedback = new javax.swing.JButton();
jSeparator6 = new javax.swing.JToolBar.Separator(); jSeparator6 = new javax.swing.JToolBar.Separator();
btnSymbols = new javax.swing.JButton(); btnDownload = new javax.swing.JButton();
jSeparatorSymbols = new javax.swing.JToolBar.Separator(); jSeparatorSymbols = new javax.swing.JToolBar.Separator();
btnImages = new javax.swing.JButton();
jSeparatorImages = 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();
btnDebug = new javax.swing.JButton(); btnDebug = new javax.swing.JButton();
@ -952,7 +953,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
jMemUsageLabel = new javax.swing.JLabel(); jMemUsageLabel = new javax.swing.JLabel();
menuDebugTestModalDialog.setText("Test Modal Dialogs"); menuDebugTestModalDialog.setText("Test Modal Dialogs");
menuDebugTestModalDialog.setFont(GUISizeHelper.dialogFont);
menuDebugTestModalDialog.addActionListener(new java.awt.event.ActionListener() { menuDebugTestModalDialog.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
menuDebugTestModalDialogActionPerformed(evt); menuDebugTestModalDialogActionPerformed(evt);
@ -961,7 +961,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
popupDebug.add(menuDebugTestModalDialog); popupDebug.add(menuDebugTestModalDialog);
menuDebugTestCardRenderModesDialog.setText("Test Card Render Modes"); menuDebugTestCardRenderModesDialog.setText("Test Card Render Modes");
menuDebugTestCardRenderModesDialog.setFont(GUISizeHelper.dialogFont);
menuDebugTestCardRenderModesDialog.addActionListener(new java.awt.event.ActionListener() { menuDebugTestCardRenderModesDialog.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
menuDebugTestCardRenderModesDialogActionPerformed(evt); menuDebugTestCardRenderModesDialogActionPerformed(evt);
@ -969,8 +968,24 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
}); });
popupDebug.add(menuDebugTestCardRenderModesDialog); popupDebug.add(menuDebugTestCardRenderModesDialog);
menuDownloadSymbols.setText("Download mana symbols");
menuDownloadSymbols.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
menuDownloadSymbolsActionPerformed(evt);
}
});
popupDownload.add(menuDownloadSymbols);
menuDownloadImages.setText("Download card images");
menuDownloadImages.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
menuDownloadImagesActionPerformed(evt);
}
});
popupDownload.add(menuDownloadImages);
setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
setMinimumSize(new java.awt.Dimension(1024, 500)); setMinimumSize(new java.awt.Dimension(1000, 500));
desktopPane.setBackground(new java.awt.Color(204, 204, 204)); desktopPane.setBackground(new java.awt.Color(204, 204, 204));
@ -1045,32 +1060,19 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
mageToolbar.add(btnSendFeedback); mageToolbar.add(btnSendFeedback);
mageToolbar.add(jSeparator6); mageToolbar.add(jSeparator6);
btnSymbols.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/symbol.png"))); // NOI18N btnDownload.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/images.png"))); // NOI18N
btnSymbols.setText("Symbols"); btnDownload.setText("Download");
btnSymbols.setToolTipText("<HTML>Load the mana and other card symbols from the internet.<br>\nOtherwise you only see the replacement sequence like {U} for blue mana symbol.<br>\nYou need to do that only once."); btnDownload.setToolTipText("Download cards images and mana symbols");
btnSymbols.setFocusable(false); btnDownload.setFocusable(false);
btnSymbols.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT); btnDownload.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
btnSymbols.addActionListener(new java.awt.event.ActionListener() { btnDownload.addMouseListener(new java.awt.event.MouseAdapter() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void mouseClicked(java.awt.event.MouseEvent evt) {
btnSymbolsActionPerformed(evt); btnDownloadMouseClicked(evt);
} }
}); });
mageToolbar.add(btnSymbols); mageToolbar.add(btnDownload);
mageToolbar.add(jSeparatorSymbols); mageToolbar.add(jSeparatorSymbols);
btnImages.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/images.png"))); // NOI18N
btnImages.setText("Images");
btnImages.setToolTipText("<HTML>Load card images from external sources.");
btnImages.setFocusable(false);
btnImages.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
btnImages.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnImagesActionPerformed(evt);
}
});
mageToolbar.add(btnImages);
mageToolbar.add(jSeparatorImages);
btnAbout.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/about.png"))); // NOI18N btnAbout.setIcon(new javax.swing.ImageIcon(getClass().getResource("/menu/about.png"))); // NOI18N
btnAbout.setText("About"); btnAbout.setText("About");
btnAbout.setToolTipText("About app"); btnAbout.setToolTipText("About app");
@ -1090,12 +1092,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
btnDebug.setFocusable(false); btnDebug.setFocusable(false);
btnDebug.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); btnDebug.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
btnDebug.addMouseListener(new java.awt.event.MouseAdapter() { btnDebug.addMouseListener(new java.awt.event.MouseAdapter() {
@Override public void mouseClicked(java.awt.event.MouseEvent evt) {
public void mouseClicked(java.awt.event.MouseEvent e) { btnDebugMouseClicked(evt);
if (!SwingUtilities.isLeftMouseButton(e)) {
return;
}
btnDebugMouseClicked(e);
} }
}); });
mageToolbar.add(btnDebug); mageToolbar.add(btnDebug);
@ -1123,10 +1121,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
.addComponent(desktopPane, javax.swing.GroupLayout.DEFAULT_SIZE, 145, Short.MAX_VALUE)) .addComponent(desktopPane, javax.swing.GroupLayout.DEFAULT_SIZE, 145, Short.MAX_VALUE))
); );
if (PreferencesDialog.getCurrentTheme().getMageToolbar() != null) {
mageToolbar.getParent().setBackground(PreferencesDialog.getCurrentTheme().getMageToolbar());
}
pack(); pack();
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
@ -1172,10 +1166,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
FeedbackDialog.main(new String[]{}); FeedbackDialog.main(new String[]{});
}//GEN-LAST:event_btnSendFeedbackActionPerformed }//GEN-LAST:event_btnSendFeedbackActionPerformed
private void btnSymbolsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSymbolsActionPerformed
downloadAdditionalResources();
}//GEN-LAST:event_btnSymbolsActionPerformed
public void downloadAdditionalResources() { public void downloadAdditionalResources() {
UserRequestMessage message = new UserRequestMessage("Download additional resources", "Do you want to download game symbols and additional image files?"); UserRequestMessage message = new UserRequestMessage("Download additional resources", "Do you want to download game symbols and additional image files?");
message.setButton1("No", null); message.setButton1("No", null);
@ -1183,16 +1173,15 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
showUserRequestDialog(message); showUserRequestDialog(message);
} }
private void btnImagesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnImagesActionPerformed
downloadImages();
}//GEN-LAST:event_btnImagesActionPerformed
private void menuDebugTestModalDialogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_menuDebugTestModalDialogActionPerformed private void menuDebugTestModalDialogActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_menuDebugTestModalDialogActionPerformed
final TestModalDialog dialog = new TestModalDialog(); final TestModalDialog dialog = new TestModalDialog();
dialog.showDialog(); dialog.showDialog();
}//GEN-LAST:event_menuDebugTestModalDialogActionPerformed }//GEN-LAST:event_menuDebugTestModalDialogActionPerformed
private void btnDebugMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_btnDebugMouseClicked private void btnDebugMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_btnDebugMouseClicked
if (!SwingUtilities.isLeftMouseButton(evt)) {
return;
}
popupDebug.show(evt.getComponent(), 0, evt.getComponent().getHeight()); popupDebug.show(evt.getComponent(), 0, evt.getComponent().getHeight());
}//GEN-LAST:event_btnDebugMouseClicked }//GEN-LAST:event_btnDebugMouseClicked
@ -1201,6 +1190,21 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
dialog.showDialog(); dialog.showDialog();
}//GEN-LAST:event_menuDebugTestCardRenderModesDialogActionPerformed }//GEN-LAST:event_menuDebugTestCardRenderModesDialogActionPerformed
private void btnDownloadMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_btnDownloadMouseClicked
if (!SwingUtilities.isLeftMouseButton(evt)) {
return;
}
popupDownload.show(evt.getComponent(), 0, evt.getComponent().getHeight());
}//GEN-LAST:event_btnDownloadMouseClicked
private void menuDownloadSymbolsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_menuDownloadSymbolsActionPerformed
downloadAdditionalResources();
}//GEN-LAST:event_menuDownloadSymbolsActionPerformed
private void menuDownloadImagesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_menuDownloadImagesActionPerformed
downloadImages();
}//GEN-LAST:event_menuDownloadImagesActionPerformed
public void downloadImages() { public void downloadImages() {
DownloadPicturesService.startDownload(); DownloadPicturesService.startDownload();
} }
@ -1546,10 +1550,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private javax.swing.JButton btnConnect; private javax.swing.JButton btnConnect;
private javax.swing.JButton btnDebug; private javax.swing.JButton btnDebug;
private javax.swing.JButton btnDeckEditor; private javax.swing.JButton btnDeckEditor;
private javax.swing.JButton btnImages; private javax.swing.JButton btnDownload;
private javax.swing.JButton btnPreferences; private javax.swing.JButton btnPreferences;
private javax.swing.JButton btnSendFeedback; private javax.swing.JButton btnSendFeedback;
private javax.swing.JButton btnSymbols;
private static javax.swing.JDesktopPane desktopPane; private static javax.swing.JDesktopPane desktopPane;
private javax.swing.JLabel jMemUsageLabel; private javax.swing.JLabel jMemUsageLabel;
private javax.swing.JToolBar.Separator jSeparator1; private javax.swing.JToolBar.Separator jSeparator1;
@ -1558,12 +1561,14 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private javax.swing.JToolBar.Separator jSeparator5; private javax.swing.JToolBar.Separator jSeparator5;
private javax.swing.JToolBar.Separator jSeparator6; private javax.swing.JToolBar.Separator jSeparator6;
private javax.swing.JToolBar.Separator jSeparator7; private javax.swing.JToolBar.Separator jSeparator7;
private javax.swing.JToolBar.Separator jSeparatorImages;
private javax.swing.JToolBar.Separator jSeparatorSymbols; private javax.swing.JToolBar.Separator jSeparatorSymbols;
private javax.swing.JToolBar mageToolbar; private javax.swing.JToolBar mageToolbar;
private javax.swing.JMenuItem menuDebugTestCardRenderModesDialog; private javax.swing.JMenuItem menuDebugTestCardRenderModesDialog;
private javax.swing.JMenuItem menuDebugTestModalDialog; private javax.swing.JMenuItem menuDebugTestModalDialog;
private javax.swing.JMenuItem menuDownloadImages;
private javax.swing.JMenuItem menuDownloadSymbols;
private javax.swing.JPopupMenu popupDebug; private javax.swing.JPopupMenu popupDebug;
private javax.swing.JPopupMenu popupDownload;
private javax.swing.JToolBar.Separator separatorDebug; private javax.swing.JToolBar.Separator separatorDebug;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
@ -1875,6 +1880,13 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
this.connectDialog.changeGUISize(); this.connectDialog.changeGUISize();
this.errorDialog.changeGUISize(); this.errorDialog.changeGUISize();
menuDownloadSymbols.setFont(font);
menuDownloadImages.setFont(font);
menuDebugTestModalDialog.setFont(font);
menuDebugTestCardRenderModesDialog.setFont(font);
mageToolbar.getParent().setBackground(PreferencesDialog.getCurrentTheme().getMageToolbar());
updateTooltipContainerSizes(); updateTooltipContainerSizes();
} }