Skip to content

Commit

Permalink
Merge branch 'sorting'
Browse files Browse the repository at this point in the history
  • Loading branch information
Olaf Lenz committed Mar 12, 2014
2 parents 66bfcd4 + 386dbfe commit 6db780e
Show file tree
Hide file tree
Showing 8 changed files with 1,157 additions and 749 deletions.
387 changes: 387 additions & 0 deletions src/java/net/sf/jabref/FileSortTab.java
View file

Large diffs are not rendered by default.

59 changes: 2 additions & 57 deletions src/java/net/sf/jabref/FileTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public class FileTab extends JPanel implements PrefsTab {
promptBeforeUsingAutoSave, includeEmptyFields, camelCase, sameColumn;
private JComboBox valueDelimiter;
private JRadioButton
saveOriginalOrder, saveAuthorOrder, saveTableOrder, saveTitleOrder,
exportOriginalOrder, exportAuthorOrder, exportTableOrder, exportTitleOrder,
resolveStringsStandard, resolveStringsAll;
private JTextField bracesAroundCapitalsFields, nonWrappableFields,
doNotResolveStringsFor;
Expand All @@ -56,14 +54,6 @@ public FileTab(JabRefFrame frame, JabRefPreferences prefs) {
GUIGlobals.getIconUrl("helpSmall"));
openLast = new JCheckBox(Globals.lang("Open last edited databases at startup"));
backup = new JCheckBox(Globals.lang("Backup old file when saving"));
saveAuthorOrder = new JRadioButton(Globals.lang("Save ordered by author/editor/year"));
exportAuthorOrder = new JRadioButton(Globals.lang("Export ordered by author/editor/year"));
saveOriginalOrder = new JRadioButton(Globals.lang("Save entries in their original order"));
exportOriginalOrder = new JRadioButton(Globals.lang("Export entries in their original order"));
saveTableOrder = new JRadioButton(Globals.lang("Save in current table sort order"));
exportTableOrder = new JRadioButton(Globals.lang("Export in current table sort order"));
saveTitleOrder = new JRadioButton(Globals.lang("Save entries ordered by title"));
exportTitleOrder = new JRadioButton(Globals.lang("Export entries ordered by title"));
autoSave = new JCheckBox(Globals.lang("Autosave"));
promptBeforeUsingAutoSave = new JCheckBox(Globals.lang("Prompt before recovering a database from an autosave file"));
autoSaveInterval = new JSpinner(new SpinnerNumberModel(1, 1, 60, 1));
Expand All @@ -73,19 +63,9 @@ public FileTab(JabRefFrame frame, JabRefPreferences prefs) {
includeEmptyFields = new JCheckBox(Globals.lang("Include empty fields"));
sameColumn = new JCheckBox(Globals.lang("Start field contents in same column"));
camelCase = new JCheckBox(Globals.lang("Use camel case for field names (e.g., \"HowPublished\" instead of \"howpublished\")"));
ButtonGroup bg = new ButtonGroup();
bg.add(saveAuthorOrder);
bg.add(saveOriginalOrder);
bg.add(saveTableOrder);
bg.add(saveTitleOrder);
bg = new ButtonGroup();
bg.add(exportAuthorOrder);
bg.add(exportOriginalOrder);
bg.add(exportTableOrder);
bg.add(exportTitleOrder);
resolveStringsAll = new JRadioButton(Globals.lang("Resolve strings for all fields except")+":");
resolveStringsStandard = new JRadioButton(Globals.lang("Resolve strings for standard BibTeX fields only"));
bg = new ButtonGroup();
ButtonGroup bg = new ButtonGroup();
bg.add(resolveStringsAll);
bg.add(resolveStringsStandard);

Expand Down Expand Up @@ -144,19 +124,6 @@ public void stateChanged(ChangeEvent changeEvent) {
builder.nextLine();
builder.append(promptBeforeUsingAutoSave);
builder.nextLine();
builder.appendSeparator(Globals.lang("Sort order"));
builder.append(saveAuthorOrder, 1);
builder.append(exportAuthorOrder, 1);
builder.nextLine();
builder.append(saveTableOrder, 1);
builder.append(exportTableOrder, 1);
builder.nextLine();
builder.append(saveOriginalOrder, 1);
builder.append(exportOriginalOrder, 1);
builder.nextLine();
builder.append(saveTitleOrder, 1);
builder.append(exportTitleOrder, 1);
builder.nextLine();
builder.appendSeparator(Globals.lang("Field saving options"));
builder.nextLine();
builder.append(camelCase);
Expand Down Expand Up @@ -184,23 +151,7 @@ public void stateChanged(ChangeEvent changeEvent) {
public void setValues() {
openLast.setSelected(_prefs.getBoolean("openLastEdited"));
backup.setSelected(_prefs.getBoolean("backup"));
if (_prefs.getBoolean("saveInStandardOrder"))
saveAuthorOrder.setSelected(true);
else if (_prefs.getBoolean("saveInOriginalOrder"))
saveOriginalOrder.setSelected(true);
else if (_prefs.getBoolean("saveInTitleOrder"))
saveTitleOrder.setSelected(true);
else
saveTableOrder.setSelected(true);
if (_prefs.getBoolean("exportInStandardOrder"))
exportAuthorOrder.setSelected(true);
else if (_prefs.getBoolean("exportInOriginalOrder"))
exportOriginalOrder.setSelected(true);
else if (_prefs.getBoolean("exportInTitleOrder"))
exportTitleOrder.setSelected(true);
else
exportTableOrder.setSelected(true);


//preserveFormatting.setSelected(_prefs.getBoolean("preserveFieldFormatting"));
autoDoubleBraces.setSelected(_prefs.getBoolean("autoDoubleBraces"));
resolveStringsAll.setSelected(_prefs.getBoolean("resolveStringsAllFields"));
Expand All @@ -222,12 +173,6 @@ else if (_prefs.getBoolean("exportInTitleOrder"))
public void storeSettings() {
_prefs.putBoolean("backup", backup.isSelected());
_prefs.putBoolean("openLastEdited", openLast.isSelected());
_prefs.putBoolean("saveInStandardOrder", saveAuthorOrder.isSelected());
_prefs.putBoolean("saveInOriginalOrder", saveOriginalOrder.isSelected());
_prefs.putBoolean("saveInTitleOrder", saveTitleOrder.isSelected());
_prefs.putBoolean("exportInStandardOrder", exportAuthorOrder.isSelected());
_prefs.putBoolean("exportInOriginalOrder", exportOriginalOrder.isSelected());
_prefs.putBoolean("exportInTitleOrder", exportTitleOrder.isSelected());
_prefs.putBoolean("autoDoubleBraces", autoDoubleBraces.isSelected());
_prefs.putBoolean("resolveStringsAllFields", resolveStringsAll.isSelected());
_prefs.put("doNotResolveStringsFor", doNotResolveStringsFor.getText().trim());
Expand Down
Loading

0 comments on commit 6db780e

Please sign in to comment.