The find toolbar now searches only in one field at a time and the user
can change the find-in field by clicking on the button. The button shows
an icon so the user knows at all times what field is selected.
We don't have the option to find in 2 or more fields at the same time
anymore, but from day to day usage I noticed that I usually only want to
search in one field at a time. It feels a lot better to me and makes it
more like gitk.
Signed-off-by: Roger C. Soares <rogersoares@xxxxxxxxxxxxxxxx>
---
org.spearce.egit.ui/icons/elcl16/author.gif | Bin 0 -> 594 bytes
org.spearce.egit.ui/icons/elcl16/comment.gif | Bin 0 -> 341 bytes
org.spearce.egit.ui/icons/elcl16/commit.gif | Bin 0 -> 173 bytes
org.spearce.egit.ui/icons/elcl16/committer.gif | Bin 0 -> 589 bytes
.../egit/ui/PluginPreferenceInitializer.java | 5 +-
.../src/org/spearce/egit/ui/UIIcons.java | 12 ++
.../src/org/spearce/egit/ui/UIPreferences.java | 2 +
.../src/org/spearce/egit/ui/UIText.java | 8 +
.../egit/ui/internal/history/FindToolbar.java | 140 +++++++++++++++-----
.../src/org/spearce/egit/ui/uitext.properties | 4 +
10 files changed, 135 insertions(+), 36 deletions(-)
create mode 100644 org.spearce.egit.ui/icons/elcl16/author.gif
create mode 100644 org.spearce.egit.ui/icons/elcl16/comment.gif
create mode 100644 org.spearce.egit.ui/icons/elcl16/commit.gif
create mode 100644 org.spearce.egit.ui/icons/elcl16/committer.gif
diff --git a/org.spearce.egit.ui/icons/elcl16/author.gif b/org.spearce.egit.ui/icons/elcl16/author.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4ae8cda9a848e562cd1574b6b797495e6d22836
GIT binary patch
literal 594
zcmZ?wbhEHb6krfwI2OU6V3??EmL+GAFK<<(;!vt-U!mn#uj|sH;ofH8*{SE<Wa!&$
z=-+7>Hqku1-!fu?b;LZUq}k5Nv)$6>`D8Ek$yrua>|b3RP+j6*T@p}N>K9SIuDRT|
zy~?Mj)@x$DM@rMS=}m5PTU{4*I4|#VTGQiDGjZ#Ne!DFbY};n->z;R{Xa1r7#m6Tv
zJ2rFm=~-(|&suwa*4hiR*Pfrf_QKpv*A{I)e`Qm~l}(vfH)XEaae2+2tGD*nY&`OK
z)6vHdPV}F+`r^*>?{}YnzxM)&e%ycY{r<}z4`2Ow^5*BWcR!!M`}yj_&$pj`z5Dd*
z!`I)RzW)9UB)|Rs{O$MGAHTo-`2GFo?;jxa=jX3K{|5*t{$yd~VyI`(VE_V9oG`Gj
zZ>Vo-ZfR}O=;-WdYY*@1H`l1w<4|i>4+#sM8D?#vA!^UmtQw@RtF0MqXKkj&G_6U+
zFEAj`KX9iGA2*v$ld`XsrRnmOLMFyq>`hAE-ah9q3ECJc2s9~r9X`53Q`pu}?MA)4
zhv$oz9?a5OA`DG(?stx9y0aKDHp{yG{r8V6K}6!nLXYhsE-gHX3z8Nn@H#ZGOw=fR
d)GW`*7JH)MAk*<a3B864hsKE~9UB=KtN}d*Uh4n=
literal 0
HcmV?d00001
diff --git a/org.spearce.egit.ui/icons/elcl16/comment.gif b/org.spearce.egit.ui/icons/elcl16/comment.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0f6e19e604a7fa73e6b2fc3fcffe65a7ec309d03
GIT binary patch
literal 341
zcmZ?wbhEHb6krfwSZc@s1iXCwe0==!ib{$~%Jxn!{sDnLfx*EMQQ^_CF$qZt$*FNE
zY02rCNf}w01;xc>W!=+OPn*AZ&VmK=maks0eAR-LYZt9tvvU2WRU5Z#*?;)pkz*I{
zKECnb@%^`-p1k{X_4EJdUw*v!`t$9VZ?As*d;RnOo1cH*{QCdy_y3Q-|9|@Z@5}GM
zpa1;-_V@qKzyE*z|NrMdX+ZHO3nLeUJ%bL&Cm=sDuoWGcU*Mr5)qk|3=wu3)@`4p5
zQoS~gOD8=ER4Qb;JLxOC?OZ-7{wARf27bvJS|$byU055KTf3TrB)K%@IYpVoc{S^F
zxFvLSv}Bnk=+tSmDC^FeJ*!TdO>g0%MRfwg`YTqhtTR}<ZoNUF?`AKLZQI=(8LR<U
Cd%3;<
literal 0
HcmV?d00001
diff --git a/org.spearce.egit.ui/icons/elcl16/commit.gif b/org.spearce.egit.ui/icons/elcl16/commit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e0625b45deef1ee3687c0dd7e521b9b9bcc11435
GIT binary patch
literal 173
zcmZ?wbhEHb6krfwc+ATH2LD&CTzU2L|JOhNzxnn5-S7V&fB*md=l{3A|9}4d|Lgz%
zKmQRx@h1x-7Xv?o4oD-&3<j2{4<|iW%UEzv{H&_5qxE6voab$erazQ&;Mw!8^p3*<
z_5-!sH{8t&tL7<iihZB%qEO`7AYACFvcRdqv@oz@qs{v7n>6%O7>a)$%Ghq6XCApX
QaD8tfn@#@9U?m1?00Qk-fdBvi
literal 0
HcmV?d00001
diff --git a/org.spearce.egit.ui/icons/elcl16/committer.gif b/org.spearce.egit.ui/icons/elcl16/committer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c31e9619e8f25d7b10396bcee4e058d938c5b43a
GIT binary patch
literal 589
zcmZ?wbhEHb6krfwI2Od9V3??EmL+GAFK<<(;!vt-U!mn#uj|sH;ofH8*{SE<Wa!&$
z=-+7>Hqku1-!fu?b;LZUq}k5Nv)$6>`D8Ek$ypXrzAmL{+xB|yjkQ)a6Sp4hRXfzD
zx_6Suu1S_J+Ld-sw%9$z^1vL~?s-QJFH$+YSiOJo@x#lt-_GMXy;A?!D$~bH^k=R<
zJ!|dxS!*xMUVDD_+6#xaSk2vZ?df{G6Fb8mZ?S#7Q|0wR)s06UZ#w$;^)dgCM?=1y
zw0M8o;q!H;FW0?JTz&ENX2PFaK7VfeeZ80X{ZYjC$4S2*W&eIs`txP!&sU8<Up4*u
zSoHhDwBKKQ{(M>U=gZo^zxMtgG(hnu3nLdpJ%bJd5P;%@fqhj&eN%HwYqN=px~h__
zNn4YllSg2Hw~LKoy$**|vzD{_lxa2+^`Z_;&5CBOex7#b8q)PrOmmy$9DNr}msaEB
zW>afY*cIsSHC;x?$UvF>$gvZr1TFN$1upKsY$GFVsV8-_{^;$KcbUbMMHp@!e=bwc
zqR-g;^!=%NE?w4UNp1TX5-$xOJGa^MxP1}cqU?O2(b#CokIxJqOiort8CN2lFSN3W
M$aTtya4=W{0B0msW&i*H
literal 0
HcmV?d00001
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/PluginPreferenceInitializer.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/PluginPreferenceInitializer.java
index 5c66d38..8970d97 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/PluginPreferenceInitializer.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/PluginPreferenceInitializer.java
@@ -51,10 +51,7 @@ public class PluginPreferenceInitializer extends AbstractPreferenceInitializer {
UIPreferences.RESOURCEHISTORY_REV_SPLIT, w);
prefs.setDefault(UIPreferences.FINDTOOLBAR_IGNORE_CASE, true);
- prefs.setDefault(UIPreferences.FINDTOOLBAR_COMMIT_ID, true);
- prefs.setDefault(UIPreferences.FINDTOOLBAR_COMMENTS, true);
- prefs.setDefault(UIPreferences.FINDTOOLBAR_AUTHOR, false);
- prefs.setDefault(UIPreferences.FINDTOOLBAR_COMMITTER, false);
+ prefs.setDefault(UIPreferences.FINDTOOLBAR_FIND_IN, 2);
}
}
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java
index 881265d..33edcec 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIIcons.java
@@ -46,6 +46,14 @@ public class UIIcons {
public static final ImageDescriptor ELCL16_NEXT;
/** Previous arrow icon */
public static final ImageDescriptor ELCL16_PREVIOUS;
+ /** Commit icon */
+ public static final ImageDescriptor ELCL16_COMMIT;
+ /** Comments icon */
+ public static final ImageDescriptor ELCL16_COMMENTS;
+ /** Author icon */
+ public static final ImageDescriptor ELCL16_AUTHOR;
+ /** Committer icon */
+ public static final ImageDescriptor ELCL16_COMMITTER;
private static final URL base;
@@ -59,6 +67,10 @@ public class UIIcons {
ELCL16_FIND = map("elcl16/find.gif");
ELCL16_NEXT = map("elcl16/next.gif");
ELCL16_PREVIOUS = map("elcl16/previous.gif");
+ ELCL16_COMMIT = map("elcl16/commit.gif");
+ ELCL16_COMMENTS = map("elcl16/comment.gif");
+ ELCL16_AUTHOR = map("elcl16/author.gif");
+ ELCL16_COMMITTER = map("elcl16/committer.gif");
}
private static ImageDescriptor map(final String icon) {
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIPreferences.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIPreferences.java
index 7f17770..51aa1b8 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIPreferences.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIPreferences.java
@@ -47,6 +47,8 @@ public class UIPreferences {
public final static String FINDTOOLBAR_AUTHOR = "findtoolbar_author";
/** */
public final static String FINDTOOLBAR_COMMITTER = "findtoolbar_committer";
+ /** */
+ public final static String FINDTOOLBAR_FIND_IN = "findtoolbar_find_in";
/** */
public final static String THEME_CommitGraphNormalFont = "org.spearce.egit.ui.CommitGraphNormalFont";
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
index dbe0df1..f000f6b 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java
@@ -90,6 +90,14 @@ public class UIText extends NLS {
/** */
public static String HistoryPage_findbar_committer;
/** */
+ public static String HistoryPage_findbar_changeto_commit;
+ /** */
+ public static String HistoryPage_findbar_changeto_comments;
+ /** */
+ public static String HistoryPage_findbar_changeto_author;
+ /** */
+ public static String HistoryPage_findbar_changeto_committer;
+ /** */
public static String HistoryPage_findbar_exceeded;
/** */
public static String HistoryPage_findbar_notFound;
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbar.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbar.java
index dbd0774..5715d12 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbar.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/FindToolbar.java
@@ -61,6 +61,14 @@ import org.spearce.egit.ui.UIText;
* @see GitHistoryPage
*/
public class FindToolbar extends Composite {
+ private static final int PREFS_FINDIN_COMMITID = 1;
+
+ private static final int PREFS_FINDIN_COMMENTS = 2;
+
+ private static final int PREFS_FINDIN_AUTHOR = 4;
+
+ private static final int PREFS_FINDIN_COMMITTER = 5;
+
private Color errorBackgroundColor;
/**
@@ -72,10 +80,6 @@ public class FindToolbar extends Composite {
private List<Listener> eventList = new ArrayList<Listener>();
- private Image nextIcon;
-
- private Image previousIcon;
-
private Table historyTable;
private SWTCommit[] fileRevisions;
@@ -92,6 +96,26 @@ public class FindToolbar extends Composite {
private String lastErrorPattern;
+ private MenuItem commitIdItem;
+
+ private MenuItem commentsItem;
+
+ private MenuItem authorItem;
+
+ private MenuItem committerItem;
+
+ private Image nextIcon;
+
+ private Image previousIcon;
+
+ private Image commitIdIcon;
+
+ private Image commentsIcon;
+
+ private Image authorIcon;
+
+ private Image committerIcon;
+
/**
* Creates the toolbar.
*
@@ -107,6 +131,10 @@ public class FindToolbar extends Composite {
errorBackgroundColor = new Color(getDisplay(), new RGB(255, 150, 150));
nextIcon = UIIcons.ELCL16_NEXT.createImage();
previousIcon = UIIcons.ELCL16_PREVIOUS.createImage();
+ commitIdIcon = UIIcons.ELCL16_COMMIT.createImage();
+ commentsIcon = UIIcons.ELCL16_COMMENTS.createImage();
+ authorIcon = UIIcons.ELCL16_AUTHOR.createImage();
+ committerIcon = UIIcons.ELCL16_COMMITTER.createImage();
GridLayout findLayout = new GridLayout();
findLayout.marginHeight = 2;
@@ -141,13 +169,13 @@ public class FindToolbar extends Composite {
final MenuItem caseItem = new MenuItem(prefsMenu, SWT.CHECK);
caseItem.setText(UIText.HistoryPage_findbar_ignorecase);
new MenuItem(prefsMenu, SWT.SEPARATOR);
- final MenuItem commitIdItem = new MenuItem(prefsMenu, SWT.CHECK);
+ commitIdItem = new MenuItem(prefsMenu, SWT.RADIO);
commitIdItem.setText(UIText.HistoryPage_findbar_commit);
- final MenuItem commentsItem = new MenuItem(prefsMenu, SWT.CHECK);
+ commentsItem = new MenuItem(prefsMenu, SWT.RADIO);
commentsItem.setText(UIText.HistoryPage_findbar_comments);
- final MenuItem authorItem = new MenuItem(prefsMenu, SWT.CHECK);
+ authorItem = new MenuItem(prefsMenu, SWT.RADIO);
authorItem.setText(UIText.HistoryPage_findbar_author);
- final MenuItem committerItem = new MenuItem(prefsMenu, SWT.CHECK);
+ committerItem = new MenuItem(prefsMenu, SWT.RADIO);
committerItem.setText(UIText.HistoryPage_findbar_committer);
prefsItem.addListener(SWT.Selection, new Listener() {
@@ -158,6 +186,21 @@ public class FindToolbar extends Composite {
+ itemBounds.height);
prefsMenu.setLocation(point);
prefsMenu.setVisible(true);
+ } else {
+ switch (prefs.getInt(UIPreferences.FINDTOOLBAR_FIND_IN)) {
+ case PREFS_FINDIN_COMMITID:
+ commentsItem.notifyListeners(SWT.Selection, null);
+ break;
+ case PREFS_FINDIN_COMMENTS:
+ authorItem.notifyListeners(SWT.Selection, null);
+ break;
+ case PREFS_FINDIN_AUTHOR:
+ committerItem.notifyListeners(SWT.Selection, null);
+ break;
+ case PREFS_FINDIN_COMMITTER:
+ commitIdItem.notifyListeners(SWT.Selection, null);
+ break;
+ }
}
}
});
@@ -276,49 +319,78 @@ public class FindToolbar extends Composite {
caseItem.setSelection(prefs
.getBoolean(UIPreferences.FINDTOOLBAR_IGNORE_CASE));
+ int selectedPrefsItem = prefs.getInt(UIPreferences.FINDTOOLBAR_FIND_IN);
+
commitIdItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- prefs.setValue(UIPreferences.FINDTOOLBAR_COMMIT_ID,
- commitIdItem.getSelection());
- Activator.getDefault().savePluginPreferences();
- clear();
+ prefsItem.setImage(commitIdIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_comments);
+ prefsItemChanged(PREFS_FINDIN_COMMITID, commitIdItem);
}
});
- commitIdItem.setSelection(prefs
- .getBoolean(UIPreferences.FINDTOOLBAR_COMMIT_ID));
+ if (selectedPrefsItem == PREFS_FINDIN_COMMITID) {
+ commitIdItem.setSelection(true);
+ prefsItem.setImage(commitIdIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_comments);
+ }
commentsItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- prefs.setValue(UIPreferences.FINDTOOLBAR_COMMENTS, commentsItem
- .getSelection());
- Activator.getDefault().savePluginPreferences();
- clear();
+ prefsItem.setImage(commentsIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_author);
+ prefsItemChanged(PREFS_FINDIN_COMMENTS, commentsItem);
}
});
- commentsItem.setSelection(prefs
- .getBoolean(UIPreferences.FINDTOOLBAR_COMMENTS));
+ if (selectedPrefsItem == PREFS_FINDIN_COMMENTS) {
+ commentsItem.setSelection(true);
+ prefsItem.setImage(commentsIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_author);
+ }
authorItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- prefs.setValue(UIPreferences.FINDTOOLBAR_AUTHOR, authorItem
- .getSelection());
- Activator.getDefault().savePluginPreferences();
- clear();
+ prefsItem.setImage(authorIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_committer);
+ prefsItemChanged(PREFS_FINDIN_AUTHOR, authorItem);
}
});
- authorItem.setSelection(prefs
- .getBoolean(UIPreferences.FINDTOOLBAR_AUTHOR));
+ if (selectedPrefsItem == PREFS_FINDIN_AUTHOR) {
+ authorItem.setSelection(true);
+ prefsItem.setImage(authorIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_committer);
+ }
committerItem.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- prefs.setValue(UIPreferences.FINDTOOLBAR_COMMITTER,
- committerItem.getSelection());
- Activator.getDefault().savePluginPreferences();
- clear();
+ prefsItem.setImage(committerIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_commit);
+ prefsItemChanged(PREFS_FINDIN_COMMITTER, committerItem);
}
});
- committerItem.setSelection(prefs
- .getBoolean(UIPreferences.FINDTOOLBAR_COMMITTER));
+ if (selectedPrefsItem == PREFS_FINDIN_COMMITTER) {
+ committerItem.setSelection(true);
+ prefsItem.setImage(committerIcon);
+ prefsItem
+ .setToolTipText(UIText.HistoryPage_findbar_changeto_commit);
+ }
+ }
+
+ private void prefsItemChanged(int findin, MenuItem item) {
+ prefs.setValue(UIPreferences.FINDTOOLBAR_FIND_IN, findin);
+ Activator.getDefault().savePluginPreferences();
+ commitIdItem.setSelection(false);
+ commentsItem.setSelection(false);
+ authorItem.setSelection(false);
+ committerItem.setSelection(false);
+ item.setSelection(true);
+ clear();
}
@Override
@@ -326,6 +398,10 @@ public class FindToolbar extends Composite {
errorBackgroundColor.dispose();
nextIcon.dispose();
previousIcon.dispose();
+ commitIdIcon.dispose();
+ commentsIcon.dispose();
+ authorIcon.dispose();
+ committerIcon.dispose();
super.dispose();
}
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties
index ef9ebee..de9af25 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties
@@ -48,6 +48,10 @@ HistoryPage_findbar_commit=Commit
HistoryPage_findbar_comments=Comments
HistoryPage_findbar_author=Author
HistoryPage_findbar_committer=Committer
+HistoryPage_findbar_changeto_commit=Change to Commit
+HistoryPage_findbar_changeto_comments=Change to Comments
+HistoryPage_findbar_changeto_author=Change to Author
+HistoryPage_findbar_changeto_committer=Change to Committer
HistoryPage_findbar_exceeded=Results limit exceeded
HistoryPage_findbar_notFound=String not found
--
1.5.4.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
