Skip to content

Commit 863ec6e

Browse files
junichi11junichi11
committed
Fix UI
1 parent 35475bb commit 863ec6e

7 files changed

Lines changed: 82 additions & 118 deletions

‎src/org/netbeans/modules/php/wordpress/ui/wizards/Bundle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ NewProjectConfigurationPanel.useLocalFileRadioButton.text=Use Local file
55
NewProjectConfigurationPanel.localFileLabel.text=
66
NewProjectConfigurationPanel.urlLabel.text=
77
NewProjectConfigurationPanel.formatCheckBox.text=Set format to project
8-
NewProjectConfigurationPanel.jLabel1.text=DB_NAME:
98
NewProjectConfigurationPanel.dbNameTextField.text=
109
NewProjectConfigurationPanel.dbUserLabel.text=DB_USER:
1110
NewProjectConfigurationPanel.dbUserTextField.text=
@@ -55,3 +54,4 @@ CreateChildThemePanel.childDirectoryNameLabel.text=Child Directory Name:
5554
CreateChildThemePanel.childDirectoryNameTextField.text=
5655
CreateChildThemePanel.childThemeNameLabel.text=Child Theme Name:
5756
CreateChildThemePanel.childThemeNameTextField.text=
57+
NewProjectConfigurationPanel.dbNameLabel.text=DB_NAME:

‎src/org/netbeans/modules/php/wordpress/ui/wizards/CreateChildThemePanel.form‎

Lines changed: 28 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -19,49 +19,36 @@
1919
<Group type="102" attributes="0">
2020
<EmptySpace max="-2" attributes="0"/>
2121
<Group type="103" groupAlignment="0" attributes="0">
22-
<Group type="102" alignment="0" attributes="0">
23-
<Group type="103" groupAlignment="0" attributes="0">
24-
<Component id="childDirectoryNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
25-
<Component id="childThemeNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
26-
</Group>
27-
<EmptySpace max="-2" attributes="0"/>
28-
<Group type="103" groupAlignment="0" attributes="0">
29-
<Component id="childDirectoryNameTextField" max="32767" attributes="0"/>
30-
<Component id="childThemeNameTextField" max="32767" attributes="0"/>
31-
</Group>
32-
</Group>
33-
<Group type="102" alignment="0" attributes="0">
34-
<Group type="103" groupAlignment="0" attributes="0">
35-
<Component id="descriptionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
36-
<Component id="childThemeUriLabel" alignment="0" min="-2" max="-2" attributes="0"/>
37-
<Component id="versionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
38-
<Component id="authorLabel" alignment="0" min="-2" max="-2" attributes="0"/>
39-
<Component id="authorUriLabel" alignment="0" min="-2" max="-2" attributes="0"/>
40-
<Component id="tagsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
41-
<Component id="textDomainLabel" alignment="0" min="-2" max="-2" attributes="0"/>
42-
</Group>
43-
<EmptySpace min="-2" pref="48" max="-2" attributes="0"/>
44-
<Group type="103" groupAlignment="0" attributes="0">
45-
<Component id="textDomainTextField" max="32767" attributes="0"/>
46-
<Component id="tagsTextField" max="32767" attributes="0"/>
47-
<Component id="childThemeUriTextField" alignment="0" max="32767" attributes="0"/>
48-
<Component id="descriptionTextField" alignment="0" max="32767" attributes="0"/>
49-
<Component id="versionTextField" alignment="0" max="32767" attributes="0"/>
50-
<Component id="authorTextField" alignment="0" max="32767" attributes="0"/>
51-
<Component id="authorUriTextField" alignment="0" max="32767" attributes="0"/>
52-
</Group>
53-
</Group>
54-
<Group type="102" attributes="0">
55-
<Component id="errorLabel" min="-2" max="-2" attributes="0"/>
56-
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
57-
</Group>
58-
<Group type="102" alignment="0" attributes="0">
59-
<Component id="parentThemeLabel" min="-2" max="-2" attributes="0"/>
60-
<EmptySpace min="-2" pref="60" max="-2" attributes="0"/>
61-
<Component id="parentThemeComboBox" max="32767" attributes="0"/>
62-
</Group>
22+
<Component id="childDirectoryNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
23+
<Component id="childThemeNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
24+
<Component id="descriptionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
25+
<Component id="childThemeUriLabel" alignment="0" min="-2" max="-2" attributes="0"/>
26+
<Component id="versionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
27+
<Component id="authorLabel" alignment="0" min="-2" max="-2" attributes="0"/>
28+
<Component id="authorUriLabel" alignment="0" min="-2" max="-2" attributes="0"/>
29+
<Component id="tagsLabel" alignment="0" min="-2" max="-2" attributes="0"/>
30+
<Component id="textDomainLabel" alignment="0" min="-2" max="-2" attributes="0"/>
31+
<Component id="parentThemeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
6332
</Group>
6433
<EmptySpace max="-2" attributes="0"/>
34+
<Group type="103" groupAlignment="0" attributes="0">
35+
<Component id="parentThemeComboBox" alignment="0" max="32767" attributes="0"/>
36+
<Component id="childDirectoryNameTextField" alignment="0" max="32767" attributes="0"/>
37+
<Component id="childThemeNameTextField" alignment="0" max="32767" attributes="0"/>
38+
<Component id="childThemeUriTextField" alignment="0" max="32767" attributes="0"/>
39+
<Component id="descriptionTextField" alignment="0" max="32767" attributes="0"/>
40+
<Component id="versionTextField" alignment="0" max="32767" attributes="0"/>
41+
<Component id="authorTextField" alignment="0" max="32767" attributes="0"/>
42+
<Component id="authorUriTextField" alignment="0" max="32767" attributes="0"/>
43+
<Component id="tagsTextField" alignment="0" max="32767" attributes="0"/>
44+
<Component id="textDomainTextField" alignment="0" max="32767" attributes="0"/>
45+
</Group>
46+
<EmptySpace max="-2" attributes="0"/>
47+
</Group>
48+
<Group type="102" attributes="0">
49+
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
50+
<Component id="errorLabel" min="-2" max="-2" attributes="0"/>
51+
<EmptySpace min="172" pref="172" max="-2" attributes="0"/>
6552
</Group>
6653
</Group>
6754
</DimensionLayout>

‎src/org/netbeans/modules/php/wordpress/ui/wizards/CreateChildThemePanel.java‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -205,40 +205,33 @@ private void initComponents() {
205205
.addGroup(layout.createSequentialGroup()
206206
.addContainerGap()
207207
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
208-
.addGroup(layout.createSequentialGroup()
209-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
210-
.addComponent(childDirectoryNameLabel)
211-
.addComponent(childThemeNameLabel))
212-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
213-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
214-
.addComponent(childDirectoryNameTextField)
215-
.addComponent(childThemeNameTextField)))
216-
.addGroup(layout.createSequentialGroup()
217-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
218-
.addComponent(descriptionLabel)
219-
.addComponent(childThemeUriLabel)
220-
.addComponent(versionLabel)
221-
.addComponent(authorLabel)
222-
.addComponent(authorUriLabel)
223-
.addComponent(tagsLabel)
224-
.addComponent(textDomainLabel))
225-
.addGap(48, 48, 48)
226-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
227-
.addComponent(textDomainTextField)
228-
.addComponent(tagsTextField)
229-
.addComponent(childThemeUriTextField)
230-
.addComponent(descriptionTextField)
231-
.addComponent(versionTextField)
232-
.addComponent(authorTextField)
233-
.addComponent(authorUriTextField)))
234-
.addGroup(layout.createSequentialGroup()
235-
.addComponent(errorLabel)
236-
.addGap(0, 0, Short.MAX_VALUE))
237-
.addGroup(layout.createSequentialGroup()
238-
.addComponent(parentThemeLabel)
239-
.addGap(60, 60, 60)
240-
.addComponent(parentThemeComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
208+
.addComponent(childDirectoryNameLabel)
209+
.addComponent(childThemeNameLabel)
210+
.addComponent(descriptionLabel)
211+
.addComponent(childThemeUriLabel)
212+
.addComponent(versionLabel)
213+
.addComponent(authorLabel)
214+
.addComponent(authorUriLabel)
215+
.addComponent(tagsLabel)
216+
.addComponent(textDomainLabel)
217+
.addComponent(parentThemeLabel))
218+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
219+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
220+
.addComponent(parentThemeComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
221+
.addComponent(childDirectoryNameTextField)
222+
.addComponent(childThemeNameTextField)
223+
.addComponent(childThemeUriTextField)
224+
.addComponent(descriptionTextField)
225+
.addComponent(versionTextField)
226+
.addComponent(authorTextField)
227+
.addComponent(authorUriTextField)
228+
.addComponent(tagsTextField)
229+
.addComponent(textDomainTextField))
241230
.addContainerGap())
231+
.addGroup(layout.createSequentialGroup()
232+
.addGap(12, 12, 12)
233+
.addComponent(errorLabel)
234+
.addGap(172, 172, 172))
242235
);
243236
layout.setVerticalGroup(
244237
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

‎src/org/netbeans/modules/php/wordpress/ui/wizards/CreateUnderscoresThemePanel.form‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</Group>
6666
<EmptySpace max="-2" attributes="0"/>
6767
<Component id="messageLabel" min="-2" max="-2" attributes="0"/>
68-
<EmptySpace pref="34" max="32767" attributes="0"/>
68+
<EmptySpace max="32767" attributes="0"/>
6969
</Group>
7070
</Group>
7171
</DimensionLayout>

‎src/org/netbeans/modules/php/wordpress/ui/wizards/CreateUnderscoresThemePanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ private void initComponents() {
182182
.addComponent(descriptionTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
183183
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
184184
.addComponent(messageLabel)
185-
.addContainerGap(34, Short.MAX_VALUE))
185+
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
186186
);
187187
}// </editor-fold>//GEN-END:initComponents
188188
// Variables declaration - do not modify//GEN-BEGIN:variables

‎src/org/netbeans/modules/php/wordpress/ui/wizards/NewProjectConfigurationPanel.form‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Component id="createConfigCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
4646
<Component id="useWpCliRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
4747
</Group>
48-
<EmptySpace min="0" pref="223" max="32767" attributes="0"/>
48+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
4949
</Group>
5050
</Group>
5151
<EmptySpace max="-2" attributes="0"/>
@@ -174,32 +174,22 @@
174174
<DimensionLayout dim="0">
175175
<Group type="103" groupAlignment="0" attributes="0">
176176
<Group type="102" attributes="0">
177-
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
178-
<EmptySpace max="-2" attributes="0"/>
179-
<Component id="dbNameTextField" max="32767" attributes="0"/>
180-
</Group>
181-
<Group type="102" alignment="0" attributes="0">
182177
<Group type="103" groupAlignment="0" attributes="0">
178+
<Component id="dbNameLabel" alignment="0" min="-2" max="-2" attributes="0"/>
183179
<Component id="dbHostLabel" alignment="0" min="-2" max="-2" attributes="0"/>
184180
<Component id="dbCharsetLabel" alignment="0" min="-2" max="-2" attributes="0"/>
185181
<Component id="dbCollateLabel" alignment="0" min="-2" max="-2" attributes="0"/>
186-
</Group>
187-
<EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
188-
<Group type="103" groupAlignment="0" attributes="0">
189-
<Component id="dbCharsetTextField" alignment="1" max="32767" attributes="0"/>
190-
<Component id="dbHostTextField" pref="119" max="32767" attributes="0"/>
191-
<Component id="dbCollateTextField" max="32767" attributes="0"/>
192-
</Group>
193-
</Group>
194-
<Group type="102" alignment="0" attributes="0">
195-
<Group type="103" groupAlignment="0" attributes="0">
196182
<Component id="dbUserLabel" alignment="0" min="-2" max="-2" attributes="0"/>
197183
<Component id="dbPasswordLabel" alignment="0" min="-2" max="-2" attributes="0"/>
198184
</Group>
199-
<EmptySpace min="-2" pref="19" max="-2" attributes="0"/>
185+
<EmptySpace max="-2" attributes="0"/>
200186
<Group type="103" groupAlignment="0" attributes="0">
201-
<Component id="dbUserTextField" max="32767" attributes="0"/>
202-
<Component id="dbPasswordTextField" max="32767" attributes="0"/>
187+
<Component id="dbNameTextField" alignment="0" max="32767" attributes="0"/>
188+
<Component id="dbUserTextField" alignment="0" max="32767" attributes="0"/>
189+
<Component id="dbPasswordTextField" alignment="0" max="32767" attributes="0"/>
190+
<Component id="dbHostTextField" alignment="0" pref="119" max="32767" attributes="0"/>
191+
<Component id="dbCharsetTextField" alignment="0" max="32767" attributes="0"/>
192+
<Component id="dbCollateTextField" alignment="0" max="32767" attributes="0"/>
203193
</Group>
204194
</Group>
205195
</Group>
@@ -208,7 +198,7 @@
208198
<Group type="103" groupAlignment="0" attributes="0">
209199
<Group type="102" alignment="0" attributes="0">
210200
<Group type="103" groupAlignment="3" attributes="0">
211-
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
201+
<Component id="dbNameLabel" alignment="3" min="-2" max="-2" attributes="0"/>
212202
<Component id="dbNameTextField" alignment="3" min="-2" max="-2" attributes="0"/>
213203
</Group>
214204
<EmptySpace max="-2" attributes="0"/>
@@ -242,10 +232,10 @@
242232
</DimensionLayout>
243233
</Layout>
244234
<SubComponents>
245-
<Component class="javax.swing.JLabel" name="jLabel1">
235+
<Component class="javax.swing.JLabel" name="dbNameLabel">
246236
<Properties>
247237
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
248-
<ResourceString bundle="org/netbeans/modules/php/wordpress/ui/wizards/Bundle.properties" key="NewProjectConfigurationPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
238+
<ResourceString bundle="org/netbeans/modules/php/wordpress/ui/wizards/Bundle.properties" key="NewProjectConfigurationPanel.dbNameLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
249239
</Property>
250240
</Properties>
251241
</Component>

0 commit comments

Comments
 (0)