Skip to content

Commit

Permalink
Merge remote-tracking branch 'rad/patches/09e0d3a3936ea1d78474cd14bb3…
Browse files Browse the repository at this point in the history
…b725bd36fbb28'
  • Loading branch information
Stelios123 committed May 2, 2024
2 parents 723c95e + 243d373 commit 8b688f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ private void updateCommitFileComponents(LinkLabel<?> fromLabel, JLabel toLabel)
}

private void showPopUp(LinkLabel<?> fromLabel, JLabel toLabel) {
var gridLayout = new JPanel(new GridLayoutManager(3, 2));
var gridLayout = new JPanel(new GridLayoutManager(4, 2));
gridLayout.setPreferredSize(new Dimension(500, 100));
var constraints = new GridConstraints();
constraints.setAnchor(GridConstraints.ANCHOR_WEST);
Expand All @@ -176,7 +176,7 @@ private void showPopUp(LinkLabel<?> fromLabel, JLabel toLabel) {
constraints.setFill(FILL_BOTH);
gridLayout.add(selectedBranch, constraints);

var saveButton = new JButton(RadicleBundle.message("save"));
var saveButton = new JButton(RadicleBundle.message("select"));
constraints.setRow(2);
constraints.setColumn(1);
gridLayout.add(saveButton, constraints);
Expand Down Expand Up @@ -300,7 +300,7 @@ private void createPatch() {
final var projectId = projectInfo.id;
var remote = findRadRemote(mySelectedRepo, projectId);
if (remote == null) {
logger.warn("Unable to find rad remote. Project ID : {}", projectId);
logger.warn("Unable to find rad remote. Project ID: {}", projectId);
RadAction.showErrorNotification(project, RadicleBundle.message("findRemoteError"),
RadicleBundle.message("findRemoteErrorDesc"));
return;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/messages/RadicleBundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ patchId=Patch ID
headRepo=Head Repository
branch=Branch
save=Save
select=Select
findRemoteError=Error finding rad remote
findRemoteErrorDesc=Unable to find rad remote
newPatch=New Patch
Expand Down

0 comments on commit 8b688f8

Please sign in to comment.