Skip to content

Commit fc36959

Browse files
junichi11junichi11
committed
Fix GitHubQueryPanel
- Ajust component positions
1 parent 0754a88 commit fc36959

2 files changed

Lines changed: 37 additions & 45 deletions

File tree

‎src/main/java/com/junichi11/netbeans/modules/github/issues/query/ui/GitHubQueryPanel.form‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
7575
</Group>
7676
<Group type="102" attributes="0">
77+
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
7778
<Group type="103" groupAlignment="0" attributes="0">
7879
<Group type="102" alignment="0" attributes="0">
79-
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
8080
<Component id="isLabel" min="-2" max="-2" attributes="0"/>
8181
<EmptySpace max="-2" attributes="0"/>
8282
<Component id="isOpenComboBox" min="-2" max="-2" attributes="0"/>
@@ -94,7 +94,6 @@
9494
<Component id="typeComboBox" min="-2" max="-2" attributes="0"/>
9595
</Group>
9696
<Group type="102" alignment="0" attributes="0">
97-
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
9897
<Component id="searchButton" min="-2" max="-2" attributes="0"/>
9998
<EmptySpace max="-2" attributes="0"/>
10099
<Component id="saveButton" min="-2" max="-2" attributes="0"/>
@@ -104,7 +103,6 @@
104103
<Component id="resultsLabel" min="-2" max="-2" attributes="0"/>
105104
</Group>
106105
<Group type="102" attributes="0">
107-
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
108106
<Component id="sortLabel" min="-2" max="-2" attributes="0"/>
109107
<EmptySpace max="-2" attributes="0"/>
110108
<Component id="sortComboBox" min="-2" max="-2" attributes="0"/>
@@ -137,23 +135,18 @@
137135
<Component id="createdTextField" alignment="3" min="-2" max="-2" attributes="0"/>
138136
</Group>
139137
<EmptySpace min="-2" max="-2" attributes="0"/>
140-
<Group type="103" groupAlignment="0" attributes="0">
141-
<Component id="mainIssueTablePanel" alignment="0" min="-2" max="-2" attributes="0"/>
142-
<Group type="102" alignment="0" attributes="0">
143-
<Group type="103" groupAlignment="3" attributes="0">
144-
<Component id="mentionsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
145-
<Component id="mentionsTextField" alignment="3" min="-2" max="-2" attributes="0"/>
146-
<Component id="updatedLabel" alignment="3" min="-2" max="-2" attributes="0"/>
147-
<Component id="updatedTextField" alignment="3" min="-2" max="-2" attributes="0"/>
148-
</Group>
149-
<EmptySpace max="-2" attributes="0"/>
150-
<Group type="103" groupAlignment="3" attributes="0">
151-
<Component id="assigneeTextField" alignment="3" min="-2" max="-2" attributes="0"/>
152-
<Component id="assigneeLabel" alignment="3" min="-2" max="-2" attributes="0"/>
153-
<Component id="mergedLabel" alignment="3" min="-2" max="-2" attributes="0"/>
154-
<Component id="mergedTextField" alignment="3" min="-2" max="-2" attributes="0"/>
155-
</Group>
156-
</Group>
138+
<Group type="103" groupAlignment="3" attributes="0">
139+
<Component id="mentionsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
140+
<Component id="mentionsTextField" alignment="3" min="-2" max="-2" attributes="0"/>
141+
<Component id="updatedLabel" alignment="3" min="-2" max="-2" attributes="0"/>
142+
<Component id="updatedTextField" alignment="3" min="-2" max="-2" attributes="0"/>
143+
</Group>
144+
<EmptySpace max="-2" attributes="0"/>
145+
<Group type="103" groupAlignment="3" attributes="0">
146+
<Component id="assigneeTextField" alignment="3" min="-2" max="-2" attributes="0"/>
147+
<Component id="assigneeLabel" alignment="3" min="-2" max="-2" attributes="0"/>
148+
<Component id="mergedLabel" alignment="3" min="-2" max="-2" attributes="0"/>
149+
<Component id="mergedTextField" alignment="3" min="-2" max="-2" attributes="0"/>
157150
</Group>
158151
<Group type="103" groupAlignment="0" attributes="0">
159152
<Group type="102" alignment="0" attributes="0">
@@ -213,6 +206,8 @@
213206
<Component id="resetButton" alignment="3" min="-2" max="-2" attributes="0"/>
214207
<Component id="resultsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
215208
</Group>
209+
<EmptySpace max="-2" attributes="0"/>
210+
<Component id="mainIssueTablePanel" min="-2" max="-2" attributes="0"/>
216211
<EmptySpace max="32767" attributes="0"/>
217212
</Group>
218213
</Group>
@@ -226,13 +221,6 @@
226221
</Property>
227222
</Properties>
228223
</Component>
229-
<Component class="javax.swing.JLabel" name="keywordLabel">
230-
<Properties>
231-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
232-
<ResourceString bundle="com/junichi11/netbeans/modules/github/issues/query/ui/Bundle.properties" key="GitHubQueryPanel.keywordLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
233-
</Property>
234-
</Properties>
235-
</Component>
236224
<Component class="javax.swing.JComboBox" name="stateComboBox">
237225
<Properties>
238226
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
@@ -243,6 +231,13 @@
243231
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;State&gt;"/>
244232
</AuxValues>
245233
</Component>
234+
<Component class="javax.swing.JLabel" name="keywordLabel">
235+
<Properties>
236+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
237+
<ResourceString bundle="com/junichi11/netbeans/modules/github/issues/query/ui/Bundle.properties" key="GitHubQueryPanel.keywordLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
238+
</Property>
239+
</Properties>
240+
</Component>
246241
<Component class="javax.swing.JTextField" name="keywordTextField">
247242
<Properties>
248243
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">

‎src/main/java/com/junichi11/netbeans/modules/github/issues/query/ui/GitHubQueryPanel.java‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ private void fireChange() {
383383
private void initComponents() {
384384

385385
stateLabel = new javax.swing.JLabel();
386-
keywordLabel = new javax.swing.JLabel();
387386
stateComboBox = new javax.swing.JComboBox<State>();
387+
keywordLabel = new javax.swing.JLabel();
388388
keywordTextField = new javax.swing.JTextField();
389389
searchButton = new javax.swing.JButton();
390390
saveButton = new javax.swing.JButton();
@@ -593,9 +593,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
593593
.addComponent(mainIssueTablePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
594594
.addGap(12, 12, 12))
595595
.addGroup(layout.createSequentialGroup()
596+
.addGap(12, 12, 12)
596597
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
597598
.addGroup(layout.createSequentialGroup()
598-
.addGap(12, 12, 12)
599599
.addComponent(isLabel)
600600
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
601601
.addComponent(isOpenComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -612,7 +612,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
612612
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
613613
.addComponent(typeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
614614
.addGroup(layout.createSequentialGroup()
615-
.addGap(12, 12, 12)
616615
.addComponent(searchButton)
617616
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
618617
.addComponent(saveButton)
@@ -621,7 +620,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
621620
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
622621
.addComponent(resultsLabel))
623622
.addGroup(layout.createSequentialGroup()
624-
.addGap(12, 12, 12)
625623
.addComponent(sortLabel)
626624
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
627625
.addComponent(sortComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -648,20 +646,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
648646
.addComponent(createdLabel)
649647
.addComponent(createdTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
650648
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
651-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
652-
.addComponent(mainIssueTablePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
653-
.addGroup(layout.createSequentialGroup()
654-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
655-
.addComponent(mentionsLabel)
656-
.addComponent(mentionsTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
657-
.addComponent(updatedLabel)
658-
.addComponent(updatedTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
659-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
660-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
661-
.addComponent(assigneeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
662-
.addComponent(assigneeLabel)
663-
.addComponent(mergedLabel)
664-
.addComponent(mergedTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
649+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
650+
.addComponent(mentionsLabel)
651+
.addComponent(mentionsTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
652+
.addComponent(updatedLabel)
653+
.addComponent(updatedTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
654+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
655+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
656+
.addComponent(assigneeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
657+
.addComponent(assigneeLabel)
658+
.addComponent(mergedLabel)
659+
.addComponent(mergedTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
665660
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
666661
.addGroup(layout.createSequentialGroup()
667662
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -709,6 +704,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
709704
.addComponent(saveButton)
710705
.addComponent(resetButton)
711706
.addComponent(resultsLabel))
707+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
708+
.addComponent(mainIssueTablePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
712709
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
713710
);
714711
}// </editor-fold>//GEN-END:initComponents

0 commit comments

Comments
 (0)