diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java index 7bc1ea72a..d02bdc704 100644 --- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java @@ -184,7 +184,9 @@ public MainFrame() this.accountStatusPanel = new AccountStatusPanel(this); - this.searchField = new SearchField(this, TreeContactList.searchFilter); + this.searchField = new SearchField( this, + TreeContactList.searchFilter, + true); menu = new MainMenu(this); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java index d0a0499db..23327b792 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchField.java @@ -66,11 +66,13 @@ public class SearchField * Creates the SearchField. * * @param frame the main application window - * @param contactList the contact list, which we're searching * @param searchFilter the filter to apply on search + * @param isCallButtonEnabled indicates if the call button should be + * enabled in this search field */ public SearchField( MainFrame frame, - ContactListSearchFilter searchFilter) + ContactListSearchFilter searchFilter, + boolean isCallButtonEnabled) { super(GuiActivator.getResources() .getI18NString("service.gui.ENTER_NAME_OR_NUMBER")); @@ -79,7 +81,10 @@ public SearchField( MainFrame frame, this.searchFilter = searchFilter; if(getUI() instanceof SearchFieldUI) + { ((SearchFieldUI)getUI()).setDeleteButtonEnabled(true); + ((SearchFieldUI)getUI()).setCallButtonEnabled(isCallButtonEnabled); + } this.setBorder(null); this.setOpaque(false); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java index bf85c9e20..4e32a2445 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java @@ -89,6 +89,16 @@ public SearchFieldUI() loadSkin(); } + /** + * Enables/disabled the call button in the search field. + * + * @param isEnabled indicates if the call button is enabled + */ + public void setCallButtonEnabled(boolean isEnabled) + { + this.isCallButtonEnabled = isEnabled; + } + /** * Implements parent paintSafely method and enables antialiasing. * @param g the Graphics object that notified us @@ -138,7 +148,6 @@ protected void customPaintBackground(Graphics g) } else isCallIconVisible = false; - } finally { diff --git a/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java b/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java index 4de87eb9a..5b62ed183 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java +++ b/src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java @@ -143,7 +143,7 @@ public InviteDialog (String title) srcContactList.setDefaultFilter(inviteFilter); - searchField = new SearchField(null, inviteFilter); + searchField = new SearchField(null, inviteFilter, false); searchField.setPreferredSize(new Dimension(200, 25)); searchField.setContactList(srcContactList); searchField.addFocusListener(new FocusAdapter() diff --git a/src/net/java/sip/communicator/impl/gui/utils/OneChoiceInviteDialog.java b/src/net/java/sip/communicator/impl/gui/utils/OneChoiceInviteDialog.java index 7ad2e9059..d9f3ef1ce 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/OneChoiceInviteDialog.java +++ b/src/net/java/sip/communicator/impl/gui/utils/OneChoiceInviteDialog.java @@ -105,7 +105,7 @@ public OneChoiceInviteDialog (String title) contactList.setDefaultFilter(inviteFilter); - searchField = new SearchField(null, inviteFilter); + searchField = new SearchField(null, inviteFilter, false); searchField.setPreferredSize(new Dimension(200, 25)); searchField.setContactList(contactList); searchField.addFocusListener(new FocusAdapter()