From 4a77ab1714531a2daae3460667121ae857ab451b Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Wed, 14 Mar 2018 18:46:28 +0400 Subject: [PATCH] * UI: added hotkeys to pick number dialog (choose value by key); --- .../mage/client/dialog/PickNumberDialog.form | 73 +++++++++---------- .../mage/client/dialog/PickNumberDialog.java | 61 +++++++++------- 2 files changed, 71 insertions(+), 63 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.form b/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.form index 7d68d2c54a1..8e06e8a075c 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.form @@ -22,22 +22,20 @@ - - + + + + + - - - - - - - + + @@ -45,10 +43,10 @@ - + - + @@ -59,29 +57,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -94,10 +69,8 @@ - - - + @@ -107,5 +80,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.java index f4e3244fb19..0851f02b91d 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/PickNumberDialog.java @@ -72,7 +72,7 @@ public class PickNumberDialog extends MageDialog { Point centered = SettingsManager.instance.getComponentPosition(getWidth(), getHeight()); this.setLocation(centered.x, centered.y); GuiDisplayUtil.keepComponentInsideScreen(centered.x, centered.y, this); - + this.setVisible(true); } @@ -93,29 +93,37 @@ public class PickNumberDialog extends MageDialog { // //GEN-BEGIN:initComponents private void initComponents() { - spnAmount = new javax.swing.JSpinner(); - btnCancel = new javax.swing.JButton(); - btnOk = new javax.swing.JButton(); jScrollPane1 = new javax.swing.JScrollPane(); lblMessage = new javax.swing.JTextPane(); - - spnAmount.setModel(new javax.swing.SpinnerNumberModel(1, null, null, 1)); - - btnCancel.setText("Cancel"); - btnCancel.addActionListener(evt -> btnCancelActionPerformed(evt)); - - btnOk.setText("OK"); - btnOk.addActionListener(evt -> btnOkActionPerformed(evt)); + spnAmount = new javax.swing.JSpinner(); + btnOk = new javax.swing.JButton(); + btnCancel = new javax.swing.JButton(); jScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - lblMessage.setBorder(null); lblMessage.setEditable(false); - lblMessage.setCursor(null ); + lblMessage.setText("long text long text long text long text long text long text long text long text"); + lblMessage.setCursor(null ); lblMessage.setFocusable(false); lblMessage.setOpaque(false); jScrollPane1.setViewportView(lblMessage); + spnAmount.setModel(new javax.swing.SpinnerNumberModel(1, null, null, 1)); + + btnOk.setText("Choose"); + btnOk.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnOkActionPerformed(evt); + } + }); + + btnCancel.setText("Cancel"); + btnCancel.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + btnCancelActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -123,32 +131,33 @@ public class PickNumberDialog extends MageDialog { .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(btnOk) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnCancel)) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)) - .addContainerGap()) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 183, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(spnAmount, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(54, 54, 54)))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(spnAmount, javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(0, 43, Short.MAX_VALUE) + .addComponent(btnOk))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(btnCancel))) + .addContainerGap()) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 64, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 86, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(spnAmount, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(btnCancel) .addComponent(btnOk)) .addContainerGap()) ); + getRootPane().setDefaultButton(btnOk); + pack(); }// //GEN-END:initComponents