Skip to content

Commit d66c234

Browse files
kopporkoppor
committed
Merge pull request #229 from JabRef/remove-non-compact-rank
Removes non-compact rank symbols in favor of compact rank
2 parents 230e7d5 + 07c11ce commit d66c234

38 files changed

+44
-184
lines changed

‎CHANGELOG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[master]
2+
- Removes non-compact rank symbols in favor of compact rank
23
- All duplicate whitespaces / tabs / newlines are now removed from non-multiline fields
34
- Fixed a bug in the IEEEXploreFetcher
45
- Replaced some deprecated DefaultFormBuilder with FormBuilder

‎src/main/java/net/sf/jabref/JabRefPreferences.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ private JabRefPreferences() {
656656
defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_PRIORITY, SpecialFieldsUtils.PREF_SHOWCOLUMN_PRIORITY_DEFAULT);
657657
defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY, SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY_DEFAULT);
658658
defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING, SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING_DEFAULT);
659-
defaults.put(SpecialFieldsUtils.PREF_RANKING_COMPACT, SpecialFieldsUtils.PREF_RANKING_COMPACT_DEFAULT);
660659
defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_RELEVANCE, SpecialFieldsUtils.PREF_SHOWCOLUMN_RELEVANCE_DEFAULT);
661660
defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_PRINTED, SpecialFieldsUtils.PREF_SHOWCOLUMN_PRINTED_DEFAULT);
662661
defaults.put(SpecialFieldsUtils.PREF_SHOWCOLUMN_READ, SpecialFieldsUtils.PREF_SHOWCOLUMN_READ_DEFAULT);

‎src/main/java/net/sf/jabref/gui/GUIGlobals.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ public class GUIGlobals {
155155

156156
public static final int DEFAULT_FIELD_LENGTH = 100;
157157
public static final int NUMBER_COL_LENGTH = 32;
158-
public static final int WIDTH_ICON_COL_RANKING = 35; // Width of Ranking Icon Column
159158
public static final int WIDTH_ICON_COL = 19;
160159

161160
// Column widths for export customization dialog table:

‎src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -821,20 +821,10 @@ private void setWidths() {
821821
cm.getColumn(0).setMinWidth(55);
822822
cm.getColumn(0).setMaxWidth(55);
823823
for (int i = 1; i < PAD; i++) {
824-
// Check if the Column is a RankingColumn
825-
// If this is the case, set a certain Column-width,
826-
// because the RankingIconColumn needs some more width
827-
if (frame.basePanel().tableFormat.isRankingColumn(i)) {
828-
// Lock the width of ranking icon column.
829-
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
830-
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
831-
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
832-
} else {
833-
// Lock the width of icon columns.
834-
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
835-
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
836-
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
837-
}
824+
// Lock the width of icon columns.
825+
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
826+
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
827+
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
838828
}
839829

840830
for (int i = 0; i < fields.length; i++) {

‎src/main/java/net/sf/jabref/gui/MainTable.java‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -323,21 +323,10 @@ private void setWidths() {
323323
TableColumnModel cm = getColumnModel();
324324
cm.getColumn(0).setPreferredWidth(ncWidth);
325325
for (int i = 1; i < tableFormat.padleft; i++) {
326-
327-
// Check if the Column is an extended RankingColumn (and not a compact-ranking column)
328-
// If this is the case, set a certain Column-width,
329-
// because the RankingIconColumn needs some more width
330-
if (tableFormat.isRankingColumn(i) && !Globals.prefs.getBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT)) {
331-
// Lock the width of ranking icon column.
332-
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
333-
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
334-
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
335-
} else {
336-
// Lock the width of icon columns.
337-
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
338-
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
339-
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
340-
}
326+
// Lock the width of icon columns.
327+
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
328+
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
329+
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
341330

342331
}
343332
for (int i = tableFormat.padleft; i < getModel().getColumnCount(); i++) {

‎src/main/java/net/sf/jabref/gui/SearchResultsDialog.java‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -255,20 +255,9 @@ private void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparat
255255
private void setWidths() {
256256
TableColumnModel cm = entryTable.getColumnModel();
257257
for (int i = 0; i < PAD; i++) {
258-
// Check if the Column is a RankingColumn
259-
// If this is the case, set a certain Column-width,
260-
// because the RankingIconColumn needs some more width
261-
if (frame.basePanel().tableFormat.isRankingColumn(i)) {
262-
// Lock the width of ranking icon column.
263-
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
264-
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
265-
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL_RANKING);
266-
} else {
267-
// Lock the width of icon columns.
268-
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
269-
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
270-
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
271-
}
258+
cm.getColumn(i).setPreferredWidth(GUIGlobals.WIDTH_ICON_COL);
259+
cm.getColumn(i).setMinWidth(GUIGlobals.WIDTH_ICON_COL);
260+
cm.getColumn(i).setMaxWidth(GUIGlobals.WIDTH_ICON_COL);
272261
}
273262

274263
for (int i = 0; i < fields.length; i++) {

‎src/main/java/net/sf/jabref/gui/preftabs/TableColumnsTab.java‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class TableColumnsTab extends JPanel implements PrefsTab {
7171
/*** begin: special fields ***/
7272
private final JCheckBox specialFieldsEnabled;
7373
private JCheckBox rankingColumn;
74-
private JCheckBox compactRankingColumn;
7574
private JCheckBox qualityColumn;
7675
private JCheckBox priorityColumn;
7776
private JCheckBox relevanceColumn;
@@ -81,7 +80,6 @@ class TableColumnsTab extends JPanel implements PrefsTab {
8180
private JRadioButton writeSpecialFields;
8281
private boolean oldSpecialFieldsEnabled;
8382
private boolean oldRankingColumn;
84-
private boolean oldCompcatRankingColumn;
8583
private boolean oldQualityColumn;
8684
private boolean oldPriorityColumn;
8785
private boolean oldRelevanceColumn;
@@ -295,7 +293,6 @@ public void stateChanged(ChangeEvent arg0) {
295293
public void stateChanged(ChangeEvent event) {
296294
boolean isEnabled = specialFieldsEnabled.isSelected();
297295
rankingColumn.setEnabled(isEnabled);
298-
compactRankingColumn.setEnabled(isEnabled && rankingColumn.isSelected());
299296
qualityColumn.setEnabled(isEnabled);
300297
priorityColumn.setEnabled(isEnabled);
301298
relevanceColumn.setEnabled(isEnabled);
@@ -306,14 +303,6 @@ public void stateChanged(ChangeEvent event) {
306303
}
307304
});
308305
rankingColumn = new JCheckBox(Localization.lang("Show rank"));
309-
rankingColumn.addChangeListener(new ChangeListener() {
310-
311-
@Override
312-
public void stateChanged(ChangeEvent event) {
313-
compactRankingColumn.setEnabled(rankingColumn.isSelected());
314-
}
315-
});
316-
compactRankingColumn = new JCheckBox(Localization.lang("Compact rank"));
317306
qualityColumn = new JCheckBox(Localization.lang("Show quality"));
318307
priorityColumn = new JCheckBox(Localization.lang("Show priority"));
319308
relevanceColumn = new JCheckBox(Localization.lang("Show relevance"));
@@ -339,12 +328,11 @@ public void stateChanged(ChangeEvent event) {
339328

340329
specialTableColumnsBuilder.add(specialFieldsEnabled, cc.xyw(1, 1, 3));
341330
specialTableColumnsBuilder.add(rankingColumn, cc.xyw(2, 2, 2));
342-
specialTableColumnsBuilder.add(compactRankingColumn, cc.xy(3, 3));
343-
specialTableColumnsBuilder.add(relevanceColumn, cc.xyw(2, 4, 2));
344-
specialTableColumnsBuilder.add(qualityColumn, cc.xyw(2, 5, 2));
345-
specialTableColumnsBuilder.add(priorityColumn, cc.xyw(2, 6, 2));
346-
specialTableColumnsBuilder.add(printedColumn, cc.xyw(2, 7, 2));
347-
specialTableColumnsBuilder.add(readStatusColumn, cc.xyw(2, 8, 2));
331+
specialTableColumnsBuilder.add(relevanceColumn, cc.xyw(2, 3, 2));
332+
specialTableColumnsBuilder.add(qualityColumn, cc.xyw(2, 4, 2));
333+
specialTableColumnsBuilder.add(priorityColumn, cc.xyw(2, 5, 2));
334+
specialTableColumnsBuilder.add(printedColumn, cc.xyw(2, 6, 2));
335+
specialTableColumnsBuilder.add(readStatusColumn, cc.xyw(2, 7, 2));
348336
specialTableColumnsBuilder.add(syncKeywords, cc.xyw(2, 10, 2));
349337
specialTableColumnsBuilder.add(writeSpecialFields, cc.xyw(2, 11, 2));
350338
specialTableColumnsBuilder.add(showOneLetterHeadingForIconColumns, cc.xyw(1, 12, 4));
@@ -420,9 +408,6 @@ public void setValues() {
420408
oldRankingColumn = prefs.getBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING);
421409
rankingColumn.setSelected(oldRankingColumn);
422410

423-
oldCompcatRankingColumn = prefs.getBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT);
424-
compactRankingColumn.setSelected(oldCompcatRankingColumn);
425-
426411
oldQualityColumn = prefs.getBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY);
427412
qualityColumn.setSelected(oldQualityColumn);
428413

@@ -731,7 +716,6 @@ public void storeSettings() {
731716

732717
boolean newSpecialFieldsEnabled = specialFieldsEnabled.isSelected();
733718
boolean newRankingColumn = rankingColumn.isSelected();
734-
boolean newCompactRankingColumn = compactRankingColumn.isSelected();
735719
boolean newQualityColumn = qualityColumn.isSelected();
736720
boolean newPriorityColumn = priorityColumn.isSelected();
737721
boolean newRelevanceColumn = relevanceColumn.isSelected();
@@ -743,7 +727,6 @@ public void storeSettings() {
743727
boolean restartRequired;
744728
restartRequired = oldSpecialFieldsEnabled != newSpecialFieldsEnabled ||
745729
oldRankingColumn != newRankingColumn ||
746-
oldCompcatRankingColumn != newCompactRankingColumn ||
747730
oldQualityColumn != newQualityColumn ||
748731
oldPriorityColumn != newPriorityColumn ||
749732
oldRelevanceColumn != newRelevanceColumn ||
@@ -765,7 +748,6 @@ public void storeSettings() {
765748
if (restartRequired) {
766749
prefs.putBoolean(SpecialFieldsUtils.PREF_SPECIALFIELDSENABLED, newSpecialFieldsEnabled);
767750
prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_RANKING, newRankingColumn);
768-
prefs.putBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT, newCompactRankingColumn);
769751
prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_PRIORITY, newPriorityColumn);
770752
prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_QUALITY, newQualityColumn);
771753
prefs.putBoolean(SpecialFieldsUtils.PREF_SHOWCOLUMN_RELEVANCE, newRelevanceColumn);

‎src/main/java/net/sf/jabref/specialfields/Rank.java‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,41 @@
1616
package net.sf.jabref.specialfields;
1717

1818
import net.sf.jabref.Globals;
19+
import net.sf.jabref.gui.IconTheme;
1920
import net.sf.jabref.logic.l10n.Localization;
2021

21-
public abstract class Rank extends SpecialField {
22+
import javax.swing.*;
23+
import java.util.ArrayList;
2224

23-
Rank() {
25+
public class Rank extends SpecialField {
26+
27+
private static Rank INSTANCE;
28+
29+
private Rank() {
2430
TEXT_DONE_PATTERN = "Set rank to '%0' for %1 entries";
31+
32+
ArrayList<SpecialFieldValue> values = new ArrayList<SpecialFieldValue>();
33+
//lab.setName("i");
34+
values.add(new SpecialFieldValue(this, null, "clearRank", Localization.lang("Clear rank"), null, Localization.lang("No rank information")));
35+
// DO NOT TRANSLATE "rank1" etc. as this makes the .bib files non portable
36+
values.add(new SpecialFieldValue(this, "rank1", "setRank1", Localization.lang("Set rank to one star"), IconTheme.getImage("rank1"), Localization.lang("One star")));
37+
values.add(new SpecialFieldValue(this, "rank2", "setRank2", Localization.lang("Set rank to two stars"), IconTheme.getImage("rank2"), Localization.lang("Two stars")));
38+
values.add(new SpecialFieldValue(this, "rank3", "setRank3", Localization.lang("Set rank to three stars"), IconTheme.getImage("rank3"), Localization.lang("Three stars")));
39+
values.add(new SpecialFieldValue(this, "rank4", "setRank4", Localization.lang("Set rank to four stars"), IconTheme.getImage("rank4"), Localization.lang("Four stars")));
40+
values.add(new SpecialFieldValue(this, "rank5", "setRank5", Localization.lang("Set rank to five stars"), IconTheme.getImage("rank5"), Localization.lang("Five stars")));
41+
this.setValues(values);
2542
}
2643

2744
public static Rank getInstance() {
28-
if (Globals.prefs.getBoolean(SpecialFieldsUtils.PREF_RANKING_COMPACT)) {
29-
return RankCompact.getInstance();
30-
} else {
31-
return RankExtended.getInstance();
45+
if (Rank.INSTANCE == null) {
46+
Rank.INSTANCE = new Rank();
3247
}
48+
return Rank.INSTANCE;
49+
}
50+
51+
@Override
52+
public Icon getRepresentingIcon() {
53+
return IconTheme.getImage("ranking");
3354
}
3455

3556
@Override

‎src/main/java/net/sf/jabref/specialfields/RankCompact.java‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎src/main/java/net/sf/jabref/specialfields/RankExtended.java‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)