From 91151f1d1d292c9c396f11ffd5f4fa06d0567c4c Mon Sep 17 00:00:00 2001 From: Matt Weeks Date: Sat, 8 Jan 2011 18:27:21 +0000 Subject: [PATCH] Update persistence options dialog. git-svn-id: file:///home/svn/framework3/trunk@11522 4d416f70-5f16-0410-b530-b9f4589650da --- data/gui/msfgui.jar | Bin 709492 -> 709740 bytes .../src/msfgui/PersistenceOptionsDialog.form | 35 +++++++---- .../src/msfgui/PersistenceOptionsDialog.java | 58 ++++++++++-------- .../PersistenceOptionsDialog.properties | 5 +- 4 files changed, 59 insertions(+), 39 deletions(-) diff --git a/data/gui/msfgui.jar b/data/gui/msfgui.jar index 2ebc7f63164e05d09e2806b86ae4f46286e55f7b..f75b550927523ef2aeda2a068dcc4490ce36bc81 100644 GIT binary patch delta 5741 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 delta 5428 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 oe(Q +
@@ -38,20 +38,22 @@ - - - + + + - + - + + + @@ -71,8 +73,9 @@ - + + @@ -157,15 +160,12 @@ - + - - + + - - - @@ -195,5 +195,14 @@ + + + + + + + + + diff --git a/external/source/gui/msfguijava/src/msfgui/PersistenceOptionsDialog.java b/external/source/gui/msfguijava/src/msfgui/PersistenceOptionsDialog.java index 32076d17e4..fd23463d25 100755 --- a/external/source/gui/msfguijava/src/msfgui/PersistenceOptionsDialog.java +++ b/external/source/gui/msfguijava/src/msfgui/PersistenceOptionsDialog.java @@ -29,11 +29,12 @@ public class PersistenceOptionsDialog extends OptionsDialog { okButton = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); cancelButton = new javax.swing.JButton(); - autostartBox = new javax.swing.JCheckBox(); + serviceRestartBox = new javax.swing.JCheckBox(); handlerBox = new javax.swing.JCheckBox(); intervalField = new javax.swing.JTextField(); intervalLabel = new javax.swing.JLabel(); loginRestartBox = new javax.swing.JCheckBox(); + anyLoginRestartBox = new javax.swing.JCheckBox(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); @@ -72,14 +73,9 @@ public class PersistenceOptionsDialog extends OptionsDialog { } }); - autostartBox.setSelected(true); - autostartBox.setText(resourceMap.getString("autostartBox.text")); // NOI18N - autostartBox.setName("autostartBox"); // NOI18N - autostartBox.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - autostartBoxActionPerformed(evt); - } - }); + serviceRestartBox.setSelected(true); + serviceRestartBox.setText(resourceMap.getString("serviceRestartBox.text")); // NOI18N + serviceRestartBox.setName("serviceRestartBox"); // NOI18N handlerBox.setText(resourceMap.getString("handlerBox.text")); // NOI18N handlerBox.setName("handlerBox"); // NOI18N @@ -99,6 +95,14 @@ public class PersistenceOptionsDialog extends OptionsDialog { } }); + anyLoginRestartBox.setText(resourceMap.getString("anyLoginRestartBox.text")); // NOI18N + anyLoginRestartBox.setName("anyLoginRestartBox"); // NOI18N + anyLoginRestartBox.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + anyLoginRestartBoxActionPerformed(evt); + } + }); + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( @@ -117,17 +121,19 @@ public class PersistenceOptionsDialog extends OptionsDialog { .addComponent(portLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(portField, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE) - .addComponent(ipField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE) - .addComponent(intervalField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 338, Short.MAX_VALUE)) + .addComponent(portField, javax.swing.GroupLayout.DEFAULT_SIZE, 424, Short.MAX_VALUE) + .addComponent(ipField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 424, Short.MAX_VALUE) + .addComponent(intervalField, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 424, Short.MAX_VALUE)) .addContainerGap()) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addComponent(handlerBox, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(autostartBox, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(serviceRestartBox, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(loginRestartBox) - .addContainerGap(177, Short.MAX_VALUE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(anyLoginRestartBox) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(cancelButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -141,8 +147,9 @@ public class PersistenceOptionsDialog extends OptionsDialog { .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(autostartBox) - .addComponent(loginRestartBox)) + .addComponent(serviceRestartBox) + .addComponent(loginRestartBox) + .addComponent(anyLoginRestartBox)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(handlerBox) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -171,7 +178,9 @@ public class PersistenceOptionsDialog extends OptionsDialog { StringBuilder cmd = new StringBuilder("persistence "); if(handlerBox.isSelected()) cmd.append(" -A "); - if(autostartBox.isSelected()) + if(serviceRestartBox.isSelected()) + cmd.append(" -S "); + if(anyLoginRestartBox.isSelected()) cmd.append(" -X "); if(loginRestartBox.isSelected()) cmd.append(" -U "); @@ -187,18 +196,18 @@ public class PersistenceOptionsDialog extends OptionsDialog { this.setVisible(false); }//GEN-LAST:event_cancelButtonActionPerformed - private void autostartBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_autostartBoxActionPerformed - if(autostartBox.isSelected()) - loginRestartBox.setSelected(false); - }//GEN-LAST:event_autostartBoxActionPerformed - private void loginRestartBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loginRestartBoxActionPerformed if(loginRestartBox.isSelected()) - autostartBox.setSelected(false); + anyLoginRestartBox.setSelected(false); }//GEN-LAST:event_loginRestartBoxActionPerformed + private void anyLoginRestartBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_anyLoginRestartBoxActionPerformed + if(anyLoginRestartBox.isSelected()) + loginRestartBox.setSelected(false); + }//GEN-LAST:event_anyLoginRestartBoxActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JCheckBox autostartBox; + private javax.swing.JCheckBox anyLoginRestartBox; private javax.swing.JButton cancelButton; private javax.swing.JCheckBox handlerBox; private javax.swing.JTextField intervalField; @@ -210,6 +219,7 @@ public class PersistenceOptionsDialog extends OptionsDialog { private javax.swing.JButton okButton; private javax.swing.JTextField portField; private javax.swing.JLabel portLabel; + private javax.swing.JCheckBox serviceRestartBox; // End of variables declaration//GEN-END:variables } diff --git a/external/source/gui/msfguijava/src/msfgui/resources/PersistenceOptionsDialog.properties b/external/source/gui/msfguijava/src/msfgui/resources/PersistenceOptionsDialog.properties index fca9fec4fe..e4304847ef 100755 --- a/external/source/gui/msfguijava/src/msfgui/resources/PersistenceOptionsDialog.properties +++ b/external/source/gui/msfguijava/src/msfgui/resources/PersistenceOptionsDialog.properties @@ -6,8 +6,9 @@ jCheckBox2.text=Start on boot? portField.text=4444 portLabel.text=Port for connect-back ipLabel.text=IP for connect-back -autostartBox.text=Restart each boot handlerBox.text=Start handler now intervalField.text=10 intervalLabel.text=Interval for connect-back -loginRestartBox.text=Restart at current user login +loginRestartBox.text=Restart on current user login +anyLoginRestartBox.text=Restart on any login +serviceRestartBox.text=Restart on boot as service