forked from I2P_Developers/i2p.i2p
Cancel and OK should work every time now (before, they only worked if the mouse did not move while clicking).
This commit is contained in:
@@ -40,7 +40,7 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
|
|||||||
okButton = new javax.swing.JButton();
|
okButton = new javax.swing.JButton();
|
||||||
cancelButton = new javax.swing.JButton();
|
cancelButton = new javax.swing.JButton();
|
||||||
|
|
||||||
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
|
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
|
||||||
setTitle(_("Tray icon configuration"));
|
setTitle(_("Tray icon configuration"));
|
||||||
|
|
||||||
desktopguiEnabled.setSelected(true);
|
desktopguiEnabled.setSelected(true);
|
||||||
@@ -49,15 +49,15 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
|
|||||||
|
|
||||||
okButton.setText("OK");
|
okButton.setText("OK");
|
||||||
okButton.addMouseListener(new java.awt.event.MouseAdapter() {
|
okButton.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
public void mouseReleased(java.awt.event.MouseEvent evt) {
|
||||||
okButtonMouseClicked(evt);
|
okButtonMouseReleased(evt);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
cancelButton.setText("Cancel");
|
cancelButton.setText("Cancel");
|
||||||
cancelButton.addMouseListener(new java.awt.event.MouseAdapter() {
|
cancelButton.addMouseListener(new java.awt.event.MouseAdapter() {
|
||||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
public void mouseReleased(java.awt.event.MouseEvent evt) {
|
||||||
cancelButtonMouseClicked(evt);
|
cancelButtonMouseReleased(evt);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -90,7 +90,20 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
|
|||||||
pack();
|
pack();
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
|
|
||||||
private void okButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_okButtonMouseClicked
|
private void cancelButtonMouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_cancelButtonMouseReleased
|
||||||
|
System.out.println("Cancelling configuration change.");
|
||||||
|
this.dispose();
|
||||||
|
}//GEN-LAST:event_cancelButtonMouseReleased
|
||||||
|
|
||||||
|
private void okButtonMouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_okButtonMouseReleased
|
||||||
|
configureDesktopgui();
|
||||||
|
}//GEN-LAST:event_okButtonMouseReleased
|
||||||
|
|
||||||
|
protected static String _(String s) {
|
||||||
|
return DesktopguiTranslator._(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void configureDesktopgui() {
|
||||||
String property = "desktopgui.enabled";
|
String property = "desktopgui.enabled";
|
||||||
String value;
|
String value;
|
||||||
if(!desktopguiEnabled.isSelected()) {
|
if(!desktopguiEnabled.isSelected()) {
|
||||||
@@ -108,15 +121,6 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame {
|
|||||||
}
|
}
|
||||||
System.out.println("Applying desktopgui configuration!");
|
System.out.println("Applying desktopgui configuration!");
|
||||||
this.dispose();
|
this.dispose();
|
||||||
}//GEN-LAST:event_okButtonMouseClicked
|
|
||||||
|
|
||||||
private void cancelButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_cancelButtonMouseClicked
|
|
||||||
System.out.println("Cancelling configuration!");
|
|
||||||
this.dispose();
|
|
||||||
}//GEN-LAST:event_cancelButtonMouseClicked
|
|
||||||
|
|
||||||
protected static String _(String s) {
|
|
||||||
return DesktopguiTranslator._(s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
|
Reference in New Issue
Block a user