empty

rjolly · Feb 29, 2020 · f3c9e49 · f3c9e49
1 parent 48ad78a
commit f3c9e49
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/mail/src/linoleum/mail/SimpleClient.form b/mail/src/linoleum/mail/SimpleClient.form
@@ -3,11 +3,6 @@
 <Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
   <NonVisualComponents>
     <Container class="linoleum.application.OptionPanel" name="optionPanel1">
-      <Properties>
-        <Property name="frame" type="linoleum.application.Frame" editor="org.netbeans.modules.form.ComponentChooserEditor">
-          <ComponentRef name="Form"/>
-        </Property>
-      </Properties>
 
       <Layout>
         <DimensionLayout dim="0">
@@ -197,6 +192,9 @@
     <Property name="resizable" type="boolean" value="true"/>
     <Property name="title" type="java.lang.String" value="Simple JavaMail Client"/>
     <Property name="name" type="java.lang.String" value="Mail" noResource="true"/>
+    <Property name="optionPanel" type="linoleum.application.OptionPanel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+      <Connection code="optionPanel1" type="code"/>
+    </Property>
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>

diff --git a/mail/src/linoleum/mail/SimpleClient.java b/mail/src/linoleum/mail/SimpleClient.java
@@ -89,13 +89,10 @@ public SettingsAction() {
 
 		@Override
 		public void actionPerformed(final ActionEvent e) {
-			optionPanel1.load();
-			final int result = JOptionPane.showInternalConfirmDialog(getDialogParent(), optionPanel1, "Account settings", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
-			switch (result) {
-			case JOptionPane.OK_OPTION:
-				optionPanel1.save();
-				break;
-			default:
+			try {
+				getApplicationManager().open(new URI("prefs", getName(), null));
+			} catch (final URISyntaxException ex) {
+				ex.printStackTrace();
 			}
 		}
 	}
@@ -287,8 +284,6 @@ private void initComponents() {
                 jSeparator2 = new javax.swing.JPopupMenu.Separator();
                 jMenuItem8 = new javax.swing.JMenuItem();
 
-                optionPanel1.setFrame(this);
-
                 jLabel1.setText("URL :");
 
                 jLabel2.setText("Transport :");
@@ -356,6 +351,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 setResizable(true);
                 setTitle("Simple JavaMail Client");
                 setName("Mail"); // NOI18N
+                setOptionPanel(optionPanel1);
                 addInternalFrameListener(new javax.swing.event.InternalFrameListener() {
                         public void internalFrameActivated(javax.swing.event.InternalFrameEvent evt) {
                         }