@@ -49,23 +49,18 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.io.File;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JButton;
import javax.swing.JComponent;
-import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
import org.nbgit.Git;
import org.nbgit.GitAnnotator;
import org.nbgit.GitModuleConfig;
import org.nbgit.util.HtmlFormatter;
-import org.netbeans.modules.versioning.util.AccessibleJFileChooser;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
-import org.openide.filesystems.FileUtil;
import org.openide.util.HelpCtx;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
@@ -78,7 +73,6 @@ final class GitOptionsPanelController extends OptionsPanelController implements
public GitOptionsPanelController() {
panel = new GitPanel(this);
- panel.exportFilenameBrowseButton.addActionListener(this);
String tooltip = NbBundle.getMessage(GitPanel.class, "GitPanel.annotationTextField.toolTipText", GitAnnotator.LABELS); // NOI18N
@@ -132,18 +126,11 @@ final class GitOptionsPanelController extends OptionsPanelController implements
}
public void actionPerformed(ActionEvent evt) {
- if (evt.getSource() == panel.exportFilenameBrowseButton) {
- onExportFilenameBrowseClick();
- } else if (evt.getSource() == panel.addButton) {
+ if (evt.getSource() == panel.addButton) {
onAddClick();
}
}
- private File getExportFile() {
- String execPath = panel.exportFilenameTextField.getText();
- return FileUtil.normalizeFile(new File(execPath));
- }
-
private Boolean validateFields() {
String username = panel.emailTextField.getText();
if (!GitModuleConfig.getDefault().isUserNameValid(username)) {
@@ -156,23 +143,6 @@ final class GitOptionsPanelController extends OptionsPanelController implements
return true;
}
- private void onExportFilenameBrowseClick() {
- File oldFile = getExportFile();
- JFileChooser fileChooser = new AccessibleJFileChooser(NbBundle.getMessage(GitOptionsPanelController.class, "ACSD_ExportBrowseFolder"), oldFile); // NOI18N
- fileChooser.setDialogTitle(NbBundle.getMessage(GitOptionsPanelController.class, "ExportBrowse_title")); // NOI18N
- fileChooser.setMultiSelectionEnabled(false);
- FileFilter[] old = fileChooser.getChoosableFileFilters();
- for (int i = 0; i < old.length; i++) {
- FileFilter fileFilter = old[i];
- fileChooser.removeChoosableFileFilter(fileFilter);
- }
- fileChooser.showDialog(panel, NbBundle.getMessage(GitOptionsPanelController.class, "OK_Button")); // NOI18N
- File f = fileChooser.getSelectedFile();
- if (f != null) {
- panel.exportFilenameTextField.setText(f.getAbsolutePath());
- }
- }
-
private GitPanel getPanel() {
if (panel == null) {
panel = new GitPanel(this);
src/org/nbgit/options/GitOptionsPanelController.java
@@ -15,11 +15,13 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="logoLabel" alignment="1" min="-2" max="-2" attributes="0"/>
- <Component id="jTabbedPane1" alignment="0" pref="691" max="32767" attributes="0"/>
+ <Group type="102" alignment="1" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="jPanel2" alignment="0" max="32767" attributes="0"/>
+ <Component id="userInformation" alignment="0" max="32767" attributes="0"/>
+ <Component id="statusLabels" alignment="0" max="32767" attributes="0"/>
+ <Component id="jPanel1" alignment="1" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
</Group>
@@ -27,411 +29,299 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <Component id="logoLabel" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="jTabbedPane1" pref="415" max="32767" attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="userInformation" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="statusLabels" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="jPanel2" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
- <Container class="javax.swing.JTabbedPane" name="jTabbedPane1">
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
- <SubComponents>
- <Container class="javax.swing.JPanel" name="generalOptionsPanel">
- <Properties>
- <Property name="opaque" type="boolean" value="false"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="General Options">
- <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="BasicSettingsTab.Title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </JTabbedPaneConstraints>
- </Constraint>
- </Constraints>
-
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="1" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
- <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
- <Component id="statusLabels" alignment="0" max="32767" attributes="0"/>
- <Component id="userInformation" alignment="0" max="32767" attributes="0"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Component id="userInformation" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="statusLabels" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="72" max="32767" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Container class="javax.swing.JPanel" name="userInformation">
- <Properties>
- <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
- <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
- <TitledBorder title="User Information">
- <ResourceString PropertyName="titleX" bundle="org/nbgit/options/Bundle.properties" key="UserInformation" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </TitledBorder>
- </Border>
- </Property>
- <Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="UserInformationPanel.Title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- <Property name="opaque" type="boolean" value="false"/>
- </Properties>
+ <Container class="javax.swing.JPanel" name="userInformation">
+ <Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+ <TitledBorder title="User Information">
+ <ResourceString PropertyName="titleX" bundle="org/nbgit/options/Bundle.properties" key="UserInformation" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </TitledBorder>
+ </Border>
+ </Property>
+ <Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="UserInformationPanel.Title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ <Property name="opaque" type="boolean" value="false"/>
+ </Properties>
- <Layout>
- <DimensionLayout dim="0">
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="userNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="emailLabel" alignment="0" min="-2" pref="95" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="emailTextField" alignment="0" pref="516" max="32767" attributes="2"/>
- <Component id="userNameTextField" alignment="0" pref="516" max="32767" attributes="2"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- </Group>
+ <Component id="userNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="emailLabel" alignment="0" min="-2" pref="95" max="-2" attributes="0"/>
</Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
+ <EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" max="-2" attributes="0">
- <Group type="103" groupAlignment="3" max="-2" attributes="0">
- <Component id="userNameTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="userNameLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="3" max="-2" attributes="0">
- <Component id="emailLabel" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="emailTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- </Group>
+ <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="emailTextField" alignment="0" pref="516" max="32767" attributes="2"/>
+ <Component id="userNameTextField" alignment="0" pref="516" max="32767" attributes="2"/>
</Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="emailLabel">
- <Properties>
- <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection component="emailTextField" type="bean"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="emailTextField">
- <Properties>
- <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="emailTextField.TOOLTIP" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- <AccessibilityProperties>
- <Property name="AccessibleContext.accessibleName" type="java.lang.String" value="Email:"/>
- <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_userNameTextField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </AccessibilityProperties>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JLabel" name="userNameLabel">
- <Properties>
- <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection component="userNameTextField" type="bean"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="userNameTextField">
- <Properties>
- <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="userNameTextField.TOOLTIP" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JLabel" name="jLabel1">
- <Properties>
- <Property name="text" type="java.lang.String" value="user@example.org"/>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
- <Container class="javax.swing.JPanel" name="statusLabels">
- <Properties>
- <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
- <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
- <TitledBorder title="Git Status Labels">
- <ResourceString PropertyName="titleX" bundle="org/nbgit/options/Bundle.properties" key="StatusLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </TitledBorder>
- </Border>
- </Property>
- <Property name="opaque" type="boolean" value="false"/>
- </Properties>
-
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="59" max="-2" attributes="0"/>
- <Component id="annotationTextField" pref="403" max="32767" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="addButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- </Group>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" max="-2" attributes="0">
+ <Group type="103" groupAlignment="3" max="-2" attributes="0">
+ <Component id="userNameTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="userNameLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="103" alignment="0" groupAlignment="3" max="-2" attributes="0">
- <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="addButton" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
- <Component id="annotationTextField" min="-2" max="-2" attributes="0"/>
- </Group>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- </Group>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" max="-2" attributes="0">
+ <Component id="emailLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="emailTextField" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="jLabel3">
- <Properties>
- <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection component="annotationTextField" type="bean"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="annotationTextField">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.annotationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="annotationTextFieldActionPerformed"/>
- </Events>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JButton" name="addButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.addButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- <AccessibilityProperties>
- <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_addButton" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </AccessibilityProperties>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
- </AuxValues>
- </Component>
- </SubComponents>
- </Container>
- <Container class="javax.swing.JPanel" name="jPanel1">
- <Properties>
- <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
- <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
- <TitledBorder title="Commit Options"/>
- </Border>
- </Property>
- </Properties>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="emailLabel">
+ <Properties>
+ <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection component="emailTextField" type="bean"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JTextField" name="emailTextField">
+ <Properties>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="emailTextField.TOOLTIP" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ <AccessibilityProperties>
+ <Property name="AccessibleContext.accessibleName" type="java.lang.String" value="Email:"/>
+ <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_userNameTextField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </AccessibilityProperties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
+ </AuxValues>
+ </Component>
+ <Component class="javax.swing.JLabel" name="userNameLabel">
+ <Properties>
+ <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection component="userNameTextField" type="bean"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jLabel5.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JTextField" name="userNameTextField">
+ <Properties>
+ <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="userNameTextField.TOOLTIP" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="user@example.org"/>
+ </Properties>
+ </Component>
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="statusLabels">
+ <Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+ <TitledBorder title="Git Status Labels">
+ <ResourceString PropertyName="titleX" bundle="org/nbgit/options/Bundle.properties" key="StatusLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </TitledBorder>
+ </Border>
+ </Property>
+ <Property name="opaque" type="boolean" value="false"/>
+ </Properties>
- <Layout>
- <DimensionLayout dim="0">
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="59" max="-2" attributes="0"/>
+ <Component id="annotationTextField" pref="403" max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="addButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="signOffCommits" alignment="0" min="-2" max="-2" attributes="0"/>
- <Component id="stripSpaceBox" alignment="0" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace pref="326" max="32767" attributes="0"/>
+ <Group type="103" alignment="0" groupAlignment="3" max="-2" attributes="0">
+ <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="addButton" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <Component id="signOffCommits" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="stripSpaceBox" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="15" max="32767" attributes="0"/>
+ <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
+ <Component id="annotationTextField" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JCheckBox" name="signOffCommits">
- <Properties>
- <Property name="text" type="java.lang.String" value="Insert Signed-off-by line in commit messages"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JCheckBox" name="stripSpaceBox">
- <Properties>
- <Property name="text" type="java.lang.String" value="Strip space from commit message"/>
- </Properties>
- </Component>
- </SubComponents>
- </Container>
- </SubComponents>
- </Container>
- <Container class="javax.swing.JPanel" name="fileOptionsPanel">
+ <EmptySpace max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="jLabel3">
+ <Properties>
+ <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+ <Connection component="annotationTextField" type="bean"/>
+ </Property>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JTextField" name="annotationTextField">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.annotationTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="annotationTextFieldActionPerformed"/>
+ </Events>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
+ </AuxValues>
+ </Component>
+ <Component class="javax.swing.JButton" name="addButton">
<Properties>
- <Property name="opaque" type="boolean" value="false"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.addButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
</Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="File">
- <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="fileOptionsPanel.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </JTabbedPaneConstraints>
- </Constraint>
- </Constraints>
+ <AccessibilityProperties>
+ <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_addButton" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </AccessibilityProperties>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
+ </AuxValues>
+ </Component>
+ </SubComponents>
+ </Container>
+ <Container class="javax.swing.JPanel" name="jPanel1">
+ <Properties>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+ <TitledBorder title="Commit Options"/>
+ </Border>
+ </Property>
+ </Properties>
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Component id="backupOnRevertModifications" min="-2" max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
- <Component id="exportFilename" min="-2" max="-2" attributes="1"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="exportFilenameTextField" min="-2" pref="145" max="-2" attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="exportFilenameBrowseButton" min="-2" max="-2" attributes="1"/>
- </Group>
- </Group>
- <EmptySpace pref="245" max="32767" attributes="0"/>
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="signOffCommits" alignment="0" min="-2" max="-2" attributes="0"/>
+ <Component id="stripSpaceBox" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
+ <EmptySpace pref="326" max="32767" attributes="0"/>
</Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="1" attributes="0">
- <EmptySpace pref="155" max="32767" attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="exportFilenameTextField" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="exportFilenameBrowseButton" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="exportFilename" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace min="-2" pref="124" max="-2" attributes="0"/>
- <Component id="backupOnRevertModifications" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="54" max="-2" attributes="0"/>
- </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="signOffCommits" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="stripSpaceBox" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="13" max="32767" attributes="0"/>
</Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="exportFilename">
- <Properties>
- <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection component="exportFilenameTextField" type="bean"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.ExportFilename.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- </Component>
- <Component class="javax.swing.JCheckBox" name="backupOnRevertModifications">
- <Properties>
- <Property name="selected" type="boolean" value="true"/>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jCheckBox1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- <AccessibilityProperties>
- <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_backupOnRevertModifications" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </AccessibilityProperties>
- </Component>
- <Component class="javax.swing.JTextField" name="exportFilenameTextField">
- <AccessibilityProperties>
- <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_exportFileNameTextField" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </AccessibilityProperties>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
- </AuxValues>
- </Component>
- <Component class="javax.swing.JButton" name="exportFilenameBrowseButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.browseButton2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </Properties>
- <AccessibilityProperties>
- <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_exportFilenameBrowseButton" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
- </Property>
- </AccessibilityProperties>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
- </AuxValues>
- </Component>
- </SubComponents>
- </Container>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JCheckBox" name="signOffCommits">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Insert Signed-off-by line in commit messages"/>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JCheckBox" name="stripSpaceBox">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Strip space from commit message"/>
+ </Properties>
+ </Component>
</SubComponents>
</Container>
- <Component class="javax.swing.JLabel" name="logoLabel">
+ <Container class="javax.swing.JPanel" name="jPanel2">
<Properties>
- <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
- <Image iconType="3" name="/org/nbgit/resources/icons/gitoptions-logo.png"/>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+ <TitledBorder title="Revert Options"/>
+ </Border>
</Property>
</Properties>
- </Component>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="backupOnRevertModifications" min="-2" max="-2" attributes="0"/>
+ <EmptySpace pref="209" max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="backupOnRevertModifications" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JCheckBox" name="backupOnRevertModifications">
+ <Properties>
+ <Property name="selected" type="boolean" value="true"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="GitPanel.jCheckBox1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ <AccessibilityProperties>
+ <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/nbgit/options/Bundle.properties" key="ACSD_backupOnRevertModifications" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </AccessibilityProperties>
+ </Component>
+ </SubComponents>
+ </Container>
</SubComponents>
</Form>
src/org/nbgit/options/GitPanel.form
@@ -91,8 +91,6 @@ final class GitPanel extends javax.swing.JPanel {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
- jTabbedPane1 = new javax.swing.JTabbedPane();
- generalOptionsPanel = new javax.swing.JPanel();
userInformation = new javax.swing.JPanel();
emailLabel = new javax.swing.JLabel();
userNameLabel = new javax.swing.JLabel();
@@ -103,12 +101,8 @@ final class GitPanel extends javax.swing.JPanel {
jPanel1 = new javax.swing.JPanel();
signOffCommits = new javax.swing.JCheckBox();
stripSpaceBox = new javax.swing.JCheckBox();
- fileOptionsPanel = new javax.swing.JPanel();
- exportFilename = new javax.swing.JLabel();
+ jPanel2 = new javax.swing.JPanel();
backupOnRevertModifications = new javax.swing.JCheckBox();
- logoLabel = new javax.swing.JLabel();
-
- generalOptionsPanel.setOpaque(false);
userInformation.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(GitPanel.class, "UserInformation"))); // NOI18N
userInformation.setName(org.openide.util.NbBundle.getMessage(GitPanel.class, "UserInformationPanel.Title")); // NOI18N
@@ -226,102 +220,57 @@ final class GitPanel extends javax.swing.JPanel {
.add(signOffCommits)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(stripSpaceBox)
- .addContainerGap(15, Short.MAX_VALUE))
- );
-
- org.jdesktop.layout.GroupLayout generalOptionsPanelLayout = new org.jdesktop.layout.GroupLayout(generalOptionsPanel);
- generalOptionsPanel.setLayout(generalOptionsPanelLayout);
- generalOptionsPanelLayout.setHorizontalGroup(
- generalOptionsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, generalOptionsPanelLayout.createSequentialGroup()
- .addContainerGap()
- .add(generalOptionsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, statusLabels, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, userInformation, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
- );
- generalOptionsPanelLayout.setVerticalGroup(
- generalOptionsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(generalOptionsPanelLayout.createSequentialGroup()
- .addContainerGap()
- .add(userInformation, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(statusLabels, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(78, Short.MAX_VALUE))
+ .addContainerGap(13, Short.MAX_VALUE))
);
- jTabbedPane1.addTab(org.openide.util.NbBundle.getMessage(GitPanel.class, "BasicSettingsTab.Title"), generalOptionsPanel); // NOI18N
-
- fileOptionsPanel.setOpaque(false);
-
- exportFilename.setLabelFor(exportFilenameTextField);
- org.openide.awt.Mnemonics.setLocalizedText(exportFilename, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.ExportFilename.text")); // NOI18N
+ jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Revert Options"));
backupOnRevertModifications.setSelected(true);
org.openide.awt.Mnemonics.setLocalizedText(backupOnRevertModifications, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.jCheckBox1.text")); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(exportFilenameBrowseButton, org.openide.util.NbBundle.getMessage(GitPanel.class, "GitPanel.browseButton2.text")); // NOI18N
-
- org.jdesktop.layout.GroupLayout fileOptionsPanelLayout = new org.jdesktop.layout.GroupLayout(fileOptionsPanel);
- fileOptionsPanel.setLayout(fileOptionsPanelLayout);
- fileOptionsPanelLayout.setHorizontalGroup(
- fileOptionsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(fileOptionsPanelLayout.createSequentialGroup()
- .add(fileOptionsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(fileOptionsPanelLayout.createSequentialGroup()
- .addContainerGap()
- .add(backupOnRevertModifications))
- .add(fileOptionsPanelLayout.createSequentialGroup()
- .add(24, 24, 24)
- .add(exportFilename)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(exportFilenameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 145, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(exportFilenameBrowseButton)))
- .addContainerGap(245, Short.MAX_VALUE))
+ org.jdesktop.layout.GroupLayout jPanel2Layout = new org.jdesktop.layout.GroupLayout(jPanel2);
+ jPanel2.setLayout(jPanel2Layout);
+ jPanel2Layout.setHorizontalGroup(
+ jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel2Layout.createSequentialGroup()
+ .addContainerGap()
+ .add(backupOnRevertModifications)
+ .addContainerGap(209, Short.MAX_VALUE))
);
- fileOptionsPanelLayout.setVerticalGroup(
- fileOptionsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, fileOptionsPanelLayout.createSequentialGroup()
- .addContainerGap(155, Short.MAX_VALUE)
- .add(fileOptionsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(exportFilenameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(exportFilenameBrowseButton)
- .add(exportFilename))
- .add(124, 124, 124)
+ jPanel2Layout.setVerticalGroup(
+ jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel2Layout.createSequentialGroup()
.add(backupOnRevertModifications)
- .add(54, 54, 54))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
backupOnRevertModifications.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_backupOnRevertModifications")); // NOI18N
- exportFilenameTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_exportFileNameTextField")); // NOI18N
- exportFilenameBrowseButton.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(GitPanel.class, "ACSD_exportFilenameBrowseButton")); // NOI18N
-
- jTabbedPane1.addTab(org.openide.util.NbBundle.getMessage(GitPanel.class, "fileOptionsPanel.title"), fileOptionsPanel); // NOI18N
-
- logoLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/nbgit/resources/icons/gitoptions-logo.png"))); // NOI18N
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, logoLabel)
- .add(jTabbedPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 691, Short.MAX_VALUE))
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, userInformation, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, statusLabels, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
- .add(logoLabel)
+ .addContainerGap()
+ .add(userInformation, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jTabbedPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 415, Short.MAX_VALUE)
- .addContainerGap())
+ .add(statusLabels, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
@@ -345,7 +294,6 @@ private void annotationTextFieldActionPerformed(java.awt.event.ActionEvent evt)
// someTextField.setText(SomeSystemOption.getDefault().getSomeStringProperty());
emailTextField.setText(GitModuleConfig.getDefault().getEmail());
userNameTextField.setText(GitModuleConfig.getDefault().getUserName());
- exportFilenameTextField.setText(GitModuleConfig.getDefault().getExportFilename());
annotationTextField.setText(GitModuleConfig.getDefault().getAnnotationFormat());
signOffCommits.setSelected(GitModuleConfig.getDefault().getSignOffCommits());
stripSpaceBox.setSelected(GitModuleConfig.getDefault().getStripSpace());
@@ -363,7 +311,6 @@ private void annotationTextFieldActionPerformed(java.awt.event.ActionEvent evt)
// SomeSystemOption.getDefault().setSomeStringProperty(someTextField.getText());
GitModuleConfig.getDefault().setEmail(emailTextField.getText());
GitModuleConfig.getDefault().setUserName(userNameTextField.getText());
- GitModuleConfig.getDefault().setExportFilename(exportFilenameTextField.getText());
GitModuleConfig.getDefault().setAnnotationFormat(annotationTextField.getText());
GitModuleConfig.getDefault().setSignOffComits(signOffCommits.isSelected());
GitModuleConfig.getDefault().setStripSpace(stripSpaceBox.isSelected());
@@ -394,16 +341,10 @@ private void annotationTextFieldActionPerformed(java.awt.event.ActionEvent evt)
private javax.swing.JCheckBox backupOnRevertModifications;
private javax.swing.JLabel emailLabel;
final javax.swing.JTextField emailTextField = new javax.swing.JTextField();
- private javax.swing.JLabel exportFilename;
- final javax.swing.JButton exportFilenameBrowseButton = new javax.swing.JButton();
- final javax.swing.JTextField exportFilenameTextField = new javax.swing.JTextField();
- private javax.swing.JPanel fileOptionsPanel;
- private javax.swing.JPanel generalOptionsPanel;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel3;
private javax.swing.JPanel jPanel1;
- private javax.swing.JTabbedPane jTabbedPane1;
- private javax.swing.JLabel logoLabel;
+ private javax.swing.JPanel jPanel2;
private javax.swing.JCheckBox signOffCommits;
private javax.swing.JPanel statusLabels;
private javax.swing.JCheckBox stripSpaceBox;
src/org/nbgit/options/GitPanel.java
19f20d32fd093b43978c7bacf5839318351499e9
Jonas Fonseca
fonseca@diku.dk
http://github.com/myabc/nbgit/commit/f81740730fb05fc469d7f634c65aace081220a0c
f81740730fb05fc469d7f634c65aace081220a0c
2009-03-27T08:50:31-07:00
2008-10-24T06:42:49-07:00
Issue 9: Further cleanup the module option UI by removing tabs and icon
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
ebc9d6913a6cf90ad0f12592dc9db90ce1e690c0
Alex Coles
alexbcoles@mac.2com