Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

[WIP] Normalise position of cancel button#5754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
thc202 wants to merge1 commit intozaproxy:main
base:main
Choose a base branch
Loading
fromthc202:dialogues-cancel-pos
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Normalise position of cancel button
Change more dialogues to show the cancel button at the end.Part of#5748.Signed-off-by: thc202 <thc202@gmail.com>
  • Loading branch information
@thc202
thc202 committedApr 13, 2021
commit21e78667a3ea4f309a4923d062e1e8f62355ff19
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ private javax.swing.JPanel getJContentPane() {

footerPane.add(footer, LayoutHelper.getGBC(x++, 0, 1, 1.0, new Insets(2, 2, 2, 2)));
footerPane.add(
getBtnCancel(),
getBtnOK(),
LayoutHelper.getGBC(
x++,
0,
Expand All@@ -166,7 +166,7 @@ private javax.swing.JPanel getJContentPane() {
GridBagConstraints.EAST,
new Insets(2, 2, 2, 2)));
footerPane.add(
getBtnOK(),
getBtnCancel(),
LayoutHelper.getGBC(
x++,
0,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,8 +160,8 @@ private JPanel getJPanel() {

jPanel.add(getAlertViewPanel(), gridBagConstraints15);
jPanel.add(jLabel2, gridBagConstraints13);
jPanel.add(getBtnCancel(), gridBagConstraints2);
jPanel.add(getBtnOk(), gridBagConstraints3);
jPanel.add(getBtnOk(), gridBagConstraints2);
jPanel.add(getBtnCancel(), gridBagConstraints3);
}
return jPanel;
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@
*/
package org.zaproxy.zap.extension.history;

import java.awt.FlowLayout;
import java.awt.Frame;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
Expand All@@ -30,6 +31,8 @@
import java.util.Vector;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;

import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.DefaultListModel;
import javax.swing.JButton;
Expand DownExpand Up@@ -152,6 +155,7 @@ private JPanel getJPanel() {
gridBagConstraints6.insets = new java.awt.Insets(5, 2, 5, 2);
gridBagConstraints6.ipadx = 3;
gridBagConstraints6.ipady = 3;
gridBagConstraints6.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints11.gridx = 0;
gridBagConstraints11.gridy = 0;
gridBagConstraints11.insets = new java.awt.Insets(5, 10, 5, 10);
Expand DownExpand Up@@ -254,10 +258,10 @@ public void actionPerformed(java.awt.event.ActionEvent e) {
*/
private JPanel getJPanel1() {
if (jPanel1 == null) {
jPanel1 = new JPanel();
jPanel1.add(getBtnCancel(), null);
jPanel1.add(getBtnReset(), null);
jPanel1.add(getBtnApply(), null);
jPanel1 = new JPanel(new FlowLayout(FlowLayout.TRAILING));
jPanel1.add(getBtnApply());
jPanel1.add(getBtnReset());
jPanel1.add(getBtnCancel());
}
return jPanel1;
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,8 +166,8 @@ private JPanel getJPanel() {
gridBagConstraints20);
jPanel.add(getJScrollPane(), gridBagConstraints30);
jPanel.add(getBtnDelete(), gridBagConstraints31);
jPanel.add(getBtnCancel(), gridBagConstraints40);
jPanel.add(getBtnSave(), gridBagConstraints41);
jPanel.add(getBtnSave(), gridBagConstraints40);
jPanel.add(getBtnCancel(), gridBagConstraints41);
}
return jPanel;
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,8 +128,8 @@ private JPanel getJPanel() {

jPanel.add(getJScrollPane(), gridBagConstraints15);
jPanel.add(jLabel2, gridBagConstraints13);
jPanel.add(getBtnCancel(), gridBagConstraints2);
jPanel.add(getBtnOk(), gridBagConstraints3);
jPanel.add(getBtnOk(), gridBagConstraints2);
jPanel.add(getBtnCancel(), gridBagConstraints3);
}
return jPanel;
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,8 +260,8 @@ private JPanel getJPanel() {
jPanel.add(
new ContextsSitesPanel(getTreeContext(), getTreeSite()), gridBagConstraints15);
jPanel.add(jLabel2, gridBagConstraints13);
jPanel.add(getCancelButton(), gridBagConstraints2);
jPanel.add(getSelectButton(), gridBagConstraints3);
jPanel.add(getSelectButton(), gridBagConstraints2);
jPanel.add(getCancelButton(), gridBagConstraints3);
}
return jPanel;
}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp