Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solved the task #850 Keyboard shortcut for 'Cleanup entries' #17

Merged
merged 2 commits into from
Aug 29, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[master]
- Feature 850: Keyboard shortcut for 'Cleanup entries' (by eduardogreco)
- Change default behaviour to be more non-invasive: timestamps and owners are NOT set by default per entry.
- "Open Folder" works again
- newline separator can now be configured globally
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/net/sf/jabref/JabRefFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ void addAction(Action a) {
writeXmpAction = new GeneralAction("writeXMP", "Write XMP-metadata to PDFs",
Globals.lang("Will write XMP-metadata to the PDFs linked from selected entries."),
prefs.getKey("Write XMP")),

openFolder = new GeneralAction("openFolder", "Open folder",
Globals.lang("Open folder"),
prefs.getKey("Open folder")),
Expand Down Expand Up @@ -355,7 +356,8 @@ void addAction(Action a) {

Cleanup = new GeneralAction("Cleanup", "Cleanup entries",
Globals.lang("Cleanup entries"),
GUIGlobals.getIconUrl("cleanupentries") ),
prefs.getKey("Cleanup"),
("cleanupentries")),

mergeEntries = new GeneralAction("mergeEntries", "Merge entries",
Globals.lang("Merge entries"),
Expand Down Expand Up @@ -1121,16 +1123,15 @@ public GeneralAction(String command, String text, String description, KeyStroke
putValue(ACCELERATOR_KEY, key);
}

/* public GeneralAction(String command, String text, String description,
URL imageUrl, KeyStroke key) {
public GeneralAction(String command, String text, String description, KeyStroke key, String imageUrl) {
this.command = command;
ImageIcon icon = GUIGlobals.getImage(command);
ImageIcon icon = GUIGlobals.getImage(imageUrl);
if (icon != null)
putValue(SMALL_ICON, icon);
putValue(NAME, text);
putValue(SHORT_DESCRIPTION, Globals.lang(description));
putValue(ACCELERATOR_KEY, key);
}*/
}

public void actionPerformed(ActionEvent e) {
if (tabbedPane.getTabCount() > 0) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/sf/jabref/JabRefPreferences.java
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,7 @@ private void defineDefaultKeyBindings() {
defKeyBinds.put("Search ACM Portal", "ctrl shift F8");
defKeyBinds.put("Fetch ArXiv.org", "shift F8");
defKeyBinds.put("Search JSTOR", "shift F9");
defKeyBinds.put("Cleanup", "ctrl shift F7");
defKeyBinds.put("Write XMP", "ctrl F7");
defKeyBinds.put("New file link", "ctrl N");
defKeyBinds.put("Fetch SPIRES", "ctrl F8");
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/help/About.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ <h2>Contributions from:</h2>
David Weitzman,
Seb Wills,
John Zedlewski,
Waluyo Adi Siswanto</p>
Waluyo Adi Siswanto,
Eduardo Roberto Greco</p>

<h2>Thanks to:</h2>

Expand Down