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.

Sign up for GitHub

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

Jump to bottom

Removes option to disable renaming in FileChooser dialogs. #280

Merged
merged 1 commit into from
Nov 4, 2015
Merged

Removes option to disable renaming in FileChooser dialogs. #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[master]
- Removes options to set PDF and PS directories per .bib database as the general options have also been deleted.
- Removes option to disable renaming in FileChooser dialogs.
- Removes option to hide the BibTeX Code tab in the entry editor.
- Changes the old integrity check by improving the code base (+tests) and converting it to a simple issues table
- Removes option to set a custom icon for the external file types. This is not possible anymore with the new icon font.
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/net/sf/jabref/JabRefPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ public class JabRefPreferences {
public static final String IMPORT_INSPECTION_DIALOG_WIDTH = "importInspectionDialogWidth";
public static final String SIDE_PANE_WIDTH = "sidePaneWidth";
public static final String LAST_USED_EXPORT = "lastUsedExport";
public static final String FILECHOOSER_DISABLE_RENAME = "filechooserDisableRename";
public static final String USE_NATIVE_FILE_DIALOG_ON_MAC = "useNativeFileDialogOnMac";
public static final String FLOAT_MARKED_ENTRIES = "floatMarkedEntries";
public static final String CITE_COMMAND = "citeCommand";
Expand Down Expand Up @@ -738,7 +737,6 @@ private JabRefPreferences() {
defaults.put(FLOAT_MARKED_ENTRIES, Boolean.TRUE);

defaults.put(USE_NATIVE_FILE_DIALOG_ON_MAC, Boolean.FALSE);
defaults.put(FILECHOOSER_DISABLE_RENAME, Boolean.TRUE);

defaults.put(LAST_USED_EXPORT, null);
defaults.put(SIDE_PANE_WIDTH, -1);
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/net/sf/jabref/gui/JabRefFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,6 @@ public JabRefFrame(JabRef jabRef) {
private void init() {
tabbedPane = new DragDropPopupPane(manageSelectors, databaseProperties, bibtexKeyPattern);

UIManager.put("FileChooser.readOnly", Globals.prefs.getBoolean(JabRefPreferences.FILECHOOSER_DISABLE_RENAME));

MyGlassPane glassPane = new MyGlassPane();
setGlassPane(glassPane);
// glassPane.setVisible(true);
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/net/sf/jabref/gui/preftabs/AdvancedTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class AdvancedTab extends JPanel implements PrefsTab {
private final JCheckBox useDefault;
private final JCheckBox useRemoteServer;
private final JCheckBox useNativeFileDialogOnMac;
private final JCheckBox filechooserDisableRename;
private final JCheckBox useIEEEAbrv;
private final JCheckBox biblatexMode;
private final JComboBox<String> className;
Expand All @@ -75,7 +74,6 @@ public AdvancedTab(JabRefPreferences prefs, HelpDialog diag, JabRef jabRef) {
useDefault = new JCheckBox(Localization.lang("Use other look and feel"));
useRemoteServer = new JCheckBox(Localization.lang("Listen for remote operation on port") + ':');
useNativeFileDialogOnMac = new JCheckBox(Localization.lang("Use native file dialog"));
filechooserDisableRename = new JCheckBox(Localization.lang("Disable file renaming in non-native file dialog"));
useIEEEAbrv = new JCheckBox(Localization.lang("Use IEEE LaTeX abbreviations"));
biblatexMode = new JCheckBox(Localization.lang("BibLaTeX mode"));
remoteServerPort = new JTextField();
Expand Down Expand Up @@ -164,9 +162,6 @@ public void stateChanged(ChangeEvent e) {
builder.nextLine();
builder.append(new JPanel());
builder.append(useNativeFileDialogOnMac);
builder.nextLine();
builder.append(new JPanel());
builder.append(filechooserDisableRename);
//}
// IEEE
builder.nextLine();
Expand Down Expand Up @@ -210,7 +205,6 @@ public void setValues() {
oldPort = remotePreferences.getPort();
remoteServerPort.setText(String.valueOf(oldPort));
useNativeFileDialogOnMac.setSelected(Globals.prefs.getBoolean(JabRefPreferences.USE_NATIVE_FILE_DIALOG_ON_MAC));
filechooserDisableRename.setSelected(Globals.prefs.getBoolean(JabRefPreferences.FILECHOOSER_DISABLE_RENAME));
useIEEEAbrv.setSelected(Globals.prefs.getBoolean(JabRefPreferences.USE_IEEE_ABRV));
oldBiblMode = Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_MODE);
biblatexMode.setSelected(oldBiblMode);
Expand All @@ -224,8 +218,6 @@ public void storeSettings() {
preferences.putBoolean(JabRefPreferences.USE_DEFAULT_LOOK_AND_FEEL, !useDefault.isSelected());
preferences.put(JabRefPreferences.WIN_LOOK_AND_FEEL, className.getSelectedItem().toString());
preferences.putBoolean(JabRefPreferences.USE_NATIVE_FILE_DIALOG_ON_MAC, useNativeFileDialogOnMac.isSelected());
preferences.putBoolean(JabRefPreferences.FILECHOOSER_DISABLE_RENAME, filechooserDisableRename.isSelected());
UIManager.put("FileChooser.readOnly", filechooserDisableRename.isSelected());

if(preferences.getBoolean(JabRefPreferences.USE_IEEE_ABRV) != useIEEEAbrv.isSelected()) {
preferences.putBoolean(JabRefPreferences.USE_IEEE_ABRV, useIEEEAbrv.isSelected());
Expand Down