mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1300, removing notes and tasks buttons -> place them in "Actions" menu

Browse Source 
dont start looking for provided strings in whole name unless more than 3 letters entered
on a huge roster it takes forever to check 500contacts if they contain "o"

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12296 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Wolf Posdorfer
2011-04-28 16:09:05 +00:00
committed by wolf.posdorfer
parent d3021a0bcd
commit ddb07c7dff
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/jivesoftware/spark/component/JContactItemField.java
View File

@ -158,12 +158,12 @@ public class JContactItemField extends JPanel {
String typedItem = textField.getText();
final List<ContactItem> validItems = new ArrayList<ContactItem>();
final List<ContactItem> validItems = new ArrayList<ContactItem>();
for (ContactItem contactItem : items) {
String nickname = contactItem.getDisplayName().toLowerCase();
if (nickname.startsWith(typedItem.toLowerCase())) {
validItems.add(contactItem);
} else if (nickname.contains(typedItem.toLowerCase())) {
} else if (typedItem.length() > 2 && nickname.contains(typedItem.toLowerCase())) {
validItems.add(contactItem);
}
}

26
src/java/org/jivesoftware/sparkimpl/plugin/scratchpad/ScratchPadPlugin.java
View File

@ -40,6 +40,9 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
@ -124,29 +127,30 @@ public class ScratchPadPlugin implements Plugin {
}
}
RolloverButton taskButton = new RolloverButton(SparkRes.getImageIcon(SparkRes.DESKTOP_IMAGE));
RolloverButton notesButton = new RolloverButton(SparkRes.getImageIcon(SparkRes.DOCUMENT_16x16));
taskButton.setToolTipText(Res.getString("button.view.tasklist"));
notesButton.setToolTipText(Res.getString("button.view.notes"));
JMenuItem taskMenu = new JMenuItem(Res.getString("button.view.tasklist"),
SparkRes.getImageIcon(SparkRes.DESKTOP_IMAGE));
JMenuItem notesMenu = new JMenuItem(Res.getString("button.view.notes"),
SparkRes.getImageIcon(SparkRes.DOCUMENT_16x16));
taskButton.addActionListener(new ActionListener() {
taskMenu.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
showTaskList();
}
});
notesButton.addActionListener(new ActionListener() {
notesMenu.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
retrieveNotes();
}
});
// Add To toolbar
SparkManager.getWorkspace().getCommandPanel().add(taskButton, index);
SparkManager.getWorkspace().getCommandPanel().add(notesButton, index);
SparkManager.getWorkspace().getCommandPanel().validate();
SparkManager.getWorkspace().getCommandPanel().invalidate();
SparkManager.getWorkspace().getCommandPanel().repaint();
JMenuBar menubar = SparkManager.getMainWindow().getMenu();
JMenu menu = menubar.getMenu(3);
menu.add(taskMenu);
menu.add(notesMenu);
// Start notifications.
new TaskNotification();