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

Adding command-t and command-e

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7833 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-03-30 20:49:32 +00:00
committed by derek
parent 8762014a5c
commit 17110c18a6
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/java/org/jivesoftware/sparkimpl/plugin/history/ConversationHistoryPlugin.java
View File

@ -25,11 +25,7 @@ import org.jivesoftware.spark.util.log.Log;
import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.Window;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
@ -102,7 +98,7 @@ public class ConversationHistoryPlugin implements Plugin {
contacts.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() == 2) {
final JLabel label = (JLabel)contacts.getSelectedValue();
final JLabel label = (JLabel) contacts.getSelectedValue();
String user = jidMap.get(label);
if (user != null) {
final String contactUsername = SparkManager.getUserManager().getUserNicknameFromJID(user);
@ -116,7 +112,7 @@ public class ConversationHistoryPlugin implements Plugin {
contacts.addKeyListener(new KeyAdapter() {
public void keyReleased(KeyEvent e) {
if (e.getKeyChar() == KeyEvent.VK_ENTER) {
final JLabel label = (JLabel)contacts.getSelectedValue();
final JLabel label = (JLabel) contacts.getSelectedValue();
String user = jidMap.get(label);
if (user != null) {
final String contactUsername = SparkManager.getUserManager().getUserNicknameFromJID(user);
@ -144,7 +140,9 @@ public class ConversationHistoryPlugin implements Plugin {
loadPreviousHistory();
// Add Keymapping to ContactList
SparkManager.getMainWindow().getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke("control E"), "historyPeople");
SparkManager.getMainWindow().getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "historyPeople");
SparkManager.getMainWindow().getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "historyPeople");
SparkManager.getMainWindow().getRootPane().getActionMap().put("historyPeople", new AbstractAction("historyPeople") {
public void actionPerformed(ActionEvent e) {
// Show History Popup
@ -171,7 +169,7 @@ public class ConversationHistoryPlugin implements Plugin {
*/
private void addUserToHistory(ChatRoom room) {
if (room instanceof ChatRoomImpl) {
ChatRoomImpl roomImpl = (ChatRoomImpl)room;
ChatRoomImpl roomImpl = (ChatRoomImpl) room;
String jid = roomImpl.getParticipantJID();
jid = StringUtils.parseBareAddress(jid);
historyList.remove(jid);
@ -319,7 +317,7 @@ public class ConversationHistoryPlugin implements Plugin {
setForeground(list.getForeground());
}
JLabel label = (JLabel)value;
JLabel label = (JLabel) value;
setText(label.getText());
setIcon(label.getIcon());
return this;

21
src/java/org/jivesoftware/sparkimpl/plugin/history/FrequentContactsPlugin.java
View File

@ -17,11 +17,7 @@ import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.util.GraphicUtils;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
import java.awt.Window;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
@ -88,7 +84,7 @@ public class FrequentContactsPlugin implements Plugin {
contacts.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() == 2) {
final JLabel label = (JLabel)contacts.getSelectedValue();
final JLabel label = (JLabel) contacts.getSelectedValue();
String user = jidMap.get(label);
if (user != null) {
final String contactUsername = SparkManager.getUserManager().getUserNicknameFromJID(user);
@ -102,7 +98,7 @@ public class FrequentContactsPlugin implements Plugin {
contacts.addKeyListener(new KeyAdapter() {
public void keyReleased(KeyEvent e) {
if (e.getKeyChar() == KeyEvent.VK_ENTER) {
final JLabel label = (JLabel)contacts.getSelectedValue();
final JLabel label = (JLabel) contacts.getSelectedValue();
String user = jidMap.get(label);
if (user != null) {
final String contactUsername = SparkManager.getUserManager().getUserNicknameFromJID(user);
@ -126,8 +122,9 @@ public class FrequentContactsPlugin implements Plugin {
}
});
// Add Keymapping to ContactList
SparkManager.getMainWindow().getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke("control T"), "favoritePeople");
// Add KeyMappings
SparkManager.getMainWindow().getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "favoritePeople");
SparkManager.getMainWindow().getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "favoritePeople");
SparkManager.getMainWindow().getRootPane().getActionMap().put("favoritePeople", new AbstractAction("favoritePeople") {
public void actionPerformed(ActionEvent e) {
// Show History Popup
@ -264,7 +261,7 @@ public class FrequentContactsPlugin implements Plugin {
setForeground(list.getForeground());
}
JLabel label = (JLabel)value;
JLabel label = (JLabel) value;
setText(label.getText());
setIcon(label.getIcon());
return this;
@ -276,8 +273,8 @@ public class FrequentContactsPlugin implements Plugin {
*/
final Comparator sizeComparator = new Comparator() {
public int compare(Object o1, Object o2) {
final File item1 = (File)o1;
final File item2 = (File)o2;
final File item1 = (File) o1;
final File item2 = (File) o2;
long int1 = item1.length();
long int2 = item2.length();