This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 0f167f9867 tweaks some versioning history settings.
new b6e0177557 Merge pull request #4951 from
mbien/defaults-versioning-history-updates
0f167f9867 is described below
commit 0f167f9867856f3b0a41e7eb281215600dd366fc
Author: Michael Bien <[email protected]>
AuthorDate: Wed Nov 9 16:23:57 2022 +0100
tweaks some versioning history settings.
- git -> show history will start with 50 entries loaded by default
- file history will show the full history by default
- search button will only show up if the advanced options are
expanded (since everything else searches at realtime)
---
.../src/org/netbeans/modules/git/ui/history/SearchExecutor.java | 2 +-
.../org/netbeans/modules/git/ui/history/SearchHistoryPanel.form | 2 --
.../org/netbeans/modules/git/ui/history/SearchHistoryPanel.java | 8 +++++---
.../netbeans/modules/versioning/ui/history/HistorySettings.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/ide/git/src/org/netbeans/modules/git/ui/history/SearchExecutor.java
b/ide/git/src/org/netbeans/modules/git/ui/history/SearchExecutor.java
index aca0105356..f73f71203d 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/history/SearchExecutor.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/history/SearchExecutor.java
@@ -55,7 +55,7 @@ class SearchExecutor extends GitProgressSupport {
private final String toRevision;
private final Date from;
private final Date to;
- static final int DEFAULT_LIMIT = 10;
+ static final int DEFAULT_LIMIT = 50;
static final int UNLIMITTED = -1;
private final SearchCriteria sc;
private final Mode mode;
diff --git
a/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.form
b/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.form
index 88e654a919..fb892f9303 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.form
+++ b/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.form
@@ -92,7 +92,6 @@
</Container>
<Container class="javax.swing.JToolBar" name="jToolBar1">
<Properties>
- <Property name="floatable" type="boolean" value="false"/>
<Property name="rollover" type="boolean" value="true"/>
</Properties>
<AuxValues>
@@ -192,7 +191,6 @@
<ResourceString
bundle="org/netbeans/modules/git/ui/history/Bundle.properties"
key="LBL_TT_SearchHistoryPanel_AllInfo"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="4"/>
- <Property name="opaque" type="boolean" value="false"/>
</Properties>
<Events>
<EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent"
handler="fileInfoCheckBoxActionPerformed"/>
diff --git
a/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.java
b/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.java
index ed28a8b8a0..72ec45c6a2 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryPanel.java
@@ -327,6 +327,7 @@ class SearchHistoryPanel extends javax.swing.JPanel
implements ExplorerManager.P
fileInfoCheckBox.setEnabled(tbSummary.isSelected());
searchCriteriaPanel.setVisible(criteriaVisible);
+ bSearch.setVisible(criteriaVisible);
expandCriteriaButton.setIcon(criteriaVisible ? ICON_EXPANDED :
ICON_COLLAPSED);
if (criteria.getLimit() <= 0) {
criteria.setLimit(SearchExecutor.UNLIMITTED);
@@ -600,9 +601,10 @@ private void
fileInfoCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//
}//GEN-LAST:event_fileInfoCheckBoxActionPerformed
private void expandCriteriaButtonActionPerformed
(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_expandCriteriaButtonActionPerformed
- searchCriteriaPanel.setVisible(!searchCriteriaPanel.isVisible());
- expandCriteriaButton.setIcon(searchCriteriaPanel.isVisible() ?
ICON_EXPANDED : ICON_COLLAPSED);
- criteriaVisible = searchCriteriaPanel.isVisible();
+ criteriaVisible = !searchCriteriaPanel.isVisible();
+ searchCriteriaPanel.setVisible(criteriaVisible);
+ bSearch.setVisible(criteriaVisible);
+ expandCriteriaButton.setIcon(criteriaVisible ? ICON_EXPANDED :
ICON_COLLAPSED);
}//GEN-LAST:event_expandCriteriaButtonActionPerformed
private void cmbFilterKindActionPerformed (java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_cmbFilterKindActionPerformed
diff --git
a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistorySettings.java
b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistorySettings.java
index 4c4439ee16..84522115ce 100644
---
a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistorySettings.java
+++
b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistorySettings.java
@@ -94,7 +94,7 @@ public class HistorySettings {
}
public boolean getLoadAll() {
- return getPreferences().getBoolean(PROP_LOAD_ALL, false);
+ return getPreferences().getBoolean(PROP_LOAD_ALL, true);
}
public void setLoadAll(boolean loadAll) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
