diff --git a/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties b/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties --- a/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties +++ b/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties @@ -42,7 +42,7 @@ LBL_CreateBranchAction_PopupName=Create Branch... LBL_CreateBranch.OKButton.text=&Create LBL_CreateBranch.title=Create Branch -CreateBranchPanel.jLabel1.text=&Branch Name: +CreateBranchPanel.jLabel1.text=Branch &Name: CreateBranchPanel.branchNameField.text= MSG_CreateBranchAction.branchCreated = Branch created\n\ Name: {0}\n\ @@ -60,5 +60,5 @@ Do you still want to delete the branch? LBL_DeleteBranchAction.confirmation=Delete Branch MSG_DeleteBranchAction.confirmation=Do you really want to delete branch {0} -CreateBranchPanel.cbCheckoutBranch.text=&Checkout Created Branch +CreateBranchPanel.cbCheckoutBranch.text=Check&out Created Branch CreateBranchPanel.cbCheckoutBranch.TTtext=Checkout the branch right after it is created diff --git a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form --- a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form +++ b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form @@ -16,10 +16,9 @@ - + - @@ -33,6 +32,7 @@ + diff --git a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java --- a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java +++ b/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java @@ -91,10 +91,9 @@ this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(revisionPickerDialog1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(jLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -104,6 +103,7 @@ .addGap(0, 0, Short.MAX_VALUE)) .addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE)) .addContainerGap()) + .addComponent(revisionPickerDialog1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties b/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties --- a/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties +++ b/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties @@ -89,7 +89,7 @@ RevisionListPanel.btnRefresh.text=&Refresh #RevisionDialog MSG_RevisionDialog.selectBranch = Select Branch -RevisionDialog.lblRevision.text=Re&vision -RevisionDialog.lblBranch.text=&Branch +RevisionDialog.lblRevision.text=Re&vision: +RevisionDialog.lblBranch.text=&Branch: RevisionListPanel.jLabel4.text=&Filter: RevisionListPanel.jLabel4.TTtext=Remove revisions from the list not complying to this criteria diff --git a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form --- a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form +++ b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.form @@ -1,4 +1,4 @@ - +
@@ -17,23 +17,23 @@ - + - + - + - - + + - + @@ -52,7 +52,7 @@ - + @@ -96,6 +96,9 @@ + + + diff --git a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java --- a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java +++ b/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java @@ -82,6 +82,7 @@ org.openide.awt.Mnemonics.setLocalizedText(btnSelectRevision, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.btnSelectRevision.text")); // NOI18N + lblBranch.setLabelFor(cmbBranches); org.openide.awt.Mnemonics.setLocalizedText(lblBranch, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.lblBranch.text")); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); @@ -91,17 +92,17 @@ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(revisionInfoPanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 395, Short.MAX_VALUE) + .addComponent(revisionInfoPanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 399, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(lblRevision) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(revisionField, javax.swing.GroupLayout.DEFAULT_SIZE, 234, Short.MAX_VALUE) + .addComponent(revisionField) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(btnSelectRevision)) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() .addComponent(lblBranch) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cmbBranches, 0, 334, Short.MAX_VALUE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(cmbBranches, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addContainerGap()) ); layout.setVerticalGroup( @@ -117,7 +118,7 @@ .addComponent(lblBranch) .addComponent(cmbBranches, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(revisionInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE) + .addComponent(revisionInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()) ); }// //GEN-END:initComponents diff --git a/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form b/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form --- a/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form +++ b/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form @@ -1,4 +1,4 @@ - +