Revert "Fix #1313"

This reverts commit 9442498.
JabRef · May 9, 2016 · 4ece35b · 4ece35b
1 parent 9442498
commit 4ece35b
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,7 +38,6 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixed: Selecting invalid jstyle causes NPE and prevents opening of style selection dialog
 - Fixed: Move linked files to default directory works again
 - Fixed [#1327](https://github.com/JabRef/jabref/issues/1327): PDF cleanup changes order of linked pdfs
-- Fixed [#1313](https://github.com/JabRef/jabref/issues/1313): Remove UI for a configuration option which was no longer available
 
 ### Removed
 - Removed possibility to export entries/databases to an `.sql` file, as the logic cannot easily use the correct escape logic

diff --git a/src/main/java/net/sf/jabref/gui/preftabs/FileTab.java b/src/main/java/net/sf/jabref/gui/preftabs/FileTab.java
@@ -67,6 +67,7 @@ class FileTab extends JPanel implements PrefsTab {
     private boolean origAutoSaveSetting;
 
     private final JTextField fileDir;
+    private final JCheckBox bibLocationAsFileDir;
     private final JCheckBox bibLocAsPrimaryDir;
     private final JCheckBox runAutoFileSearch;
     private final JCheckBox allowFileAutoOpenBrowse;
@@ -81,9 +82,11 @@ public FileTab(JabRefFrame frame, JabRefPreferences prefs) {
         this.frame = frame;
 
         fileDir = new JTextField(25);
+        bibLocationAsFileDir = new JCheckBox(Localization.lang("Allow file links relative to each bib file's location"));
         bibLocAsPrimaryDir = new JCheckBox(Localization.lang("Use the bib file location as primary file directory"));
         bibLocAsPrimaryDir.setToolTipText(Localization.lang("When downloading files, or moving linked files to the "
                 + "file directory, prefer the bib file location rather than the file directory set above"));
+        bibLocationAsFileDir.addChangeListener(e -> bibLocAsPrimaryDir.setEnabled(bibLocationAsFileDir.isSelected()));
         runAutoFileSearch = new JCheckBox(Localization.lang("When opening file link, search for matching file if no link is defined"));
         allowFileAutoOpenBrowse = new JCheckBox(Localization.lang("Automatically open browse dialog when creating new file link"));
         regExpTextField = new JTextField(25);
@@ -163,6 +166,8 @@ public FileTab(JabRefFrame frame, JabRefPreferences prefs) {
         BrowseAction browse = BrowseAction.buildForDir(this.frame, fileDir);
         builder.append(new JButton(browse));
         builder.nextLine();
+        builder.append(bibLocationAsFileDir, 3);
+        builder.nextLine();
         builder.append(bibLocAsPrimaryDir, 3);
         builder.nextLine();
         builder.append(matchStartsWithKey, 3);
@@ -207,6 +212,7 @@ public FileTab(JabRefFrame frame, JabRefPreferences prefs) {
     public void setValues() {
         fileDir.setText(prefs.get(Globals.FILE_FIELD + Globals.DIR_SUFFIX));
         bibLocAsPrimaryDir.setSelected(prefs.getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR));
+        bibLocAsPrimaryDir.setEnabled(bibLocationAsFileDir.isSelected());
         runAutoFileSearch.setSelected(prefs.getBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH));
         allowFileAutoOpenBrowse.setSelected(prefs.getBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE));
         regExpTextField.setText(prefs.get(JabRefPreferences.REG_EXP_SEARCH_EXPRESSION_KEY));

diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
@@ -1076,6 +1076,7 @@ Could_not_open_%0=Kunne_ikke_åbne_%0
 Unknown_import_format=Ukendt_importformat
 Web_search=Websøgning
 
+Allow_file_links_relative_to_each_bib_file's_location=Tillad_fillinks_relativt_fra_biblioteket_hvor_hver_bib-fil_ligger
 Style_selection=Valg_af_stil
 
 No_valid_style_file_defined=Ingen_gyldig_stilfil_defineret

diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
@@ -1784,6 +1784,7 @@ Could_not_open_%0=%0_konnte_nicht_geöffnet_werden
 Unknown_import_format=Unbekanntes_Import-Format
 Web_search=Internetrecherche
 
+Allow_file_links_relative_to_each_bib_file's_location=Dateilinks_relativ_zum_Pfad_der_bib-Datei_erlauben
 Style_selection=Stil-Auswahl
 
 No_valid_style_file_defined=Keine_gültige_Stildatei_angegeben

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -1686,6 +1686,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=Could_not_open_%0
 Unknown_import_format=Unknown_import_format
 Web_search=Web_search
+Allow_file_links_relative_to_each_bib_file's_location=Allow_file_links_relative_to_each_bib_file's_location
 Style_selection=Style_selection
 No_valid_style_file_defined=No_valid_style_file_defined
 Choose_pattern=Choose_pattern

diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
@@ -993,6 +993,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=No_se_puede_abrir_%0
 Unknown_import_format=Formato_de_importación_desconocido
 Web_search=Búsqueda_web
+Allow_file_links_relative_to_each_bib_file's_location=Permitir_enlaces_a_archivos_relativos_a_la_ubicación_de_cada_archivo_bib
 Style_selection=Selección_de_estilo
 No_valid_style_file_defined=No_se_ha_definido_un_archivo_de_estilo_válido
 Choose_pattern=Escoger_patrón

diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
@@ -1738,6 +1738,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=
 Unknown_import_format=
 Web_search=
+Allow_file_links_relative_to_each_bib_file's_location=
 Style_selection=
 No_valid_style_file_defined=
 Choose_pattern=

diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
@@ -1013,6 +1013,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=%0_n'a_pas_pu_être_ouvert
 Unknown_import_format=Format_d'importation_inconnu
 Web_search=Recherche_web
+Allow_file_links_relative_to_each_bib_file's_location=Autoriser_les_liens_de_fichier_relatif_à_chaque_répertoire_de_fichier_BibTeX
 Style_selection=Sélection_du_style
 
 No_valid_style_file_defined=Aucun_style_de_fichier_valide_n'est_défini

diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
@@ -994,6 +994,7 @@ Could_not_open_%0=Tidak_bisa_membuka_%0
 Unknown_import_format=Format_impor_tidak_dikenal
 Web_search=Pencarian_Web
 
+Allow_file_links_relative_to_each_bib_file's_location=Membolehkan_lokasi_tautan_berkas_relatif_untuk_tiap-tiap_berkas_bib
 Style_selection=Pilihan_gaya
 
 No_valid_style_file_defined=(gaya_yang_sah_tidak_ditemukan)

diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
@@ -1091,6 +1091,7 @@ Could_not_open_%0=Impossiblie_aprire_%0
 Unknown_import_format=Formato_di_importazione_sconosciuto
 Web_search=Ricerca_sul_Web
 
+Allow_file_links_relative_to_each_bib_file's_location=Consenti_il_collegamento_dei_file_relativo_alla_posizione_di_ciascun_file_BibTeX
 Style_selection=Selezione_dello_stile
 
 No_valid_style_file_defined=Nessun_file_di_stile_valido_definito

diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
@@ -1767,6 +1767,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=%0を開くことができませんでした
 Unknown_import_format=未知の読み込み型です
 Web_search=ウェブ検索
+Allow_file_links_relative_to_each_bib_file's_location=各bibファイルの場所から相対パスでファイルをリンクすることを許可
 Style_selection=様式の選択
 
 No_valid_style_file_defined=有効な様式ファイルが定義されていません

diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
@@ -1769,6 +1769,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=
 Unknown_import_format=
 Web_search=
+Allow_file_links_relative_to_each_bib_file's_location=
 Style_selection=
 
 No_valid_style_file_defined=

diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
@@ -2144,6 +2144,8 @@ Web_search=Webs\u00f8k
 
 
 
+Allow_file_links_relative_to_each_bib_file's_location=Tillat_fillenker_relativt_fra_katalogen_hvor_hver_bib-fil_ligger
+
 Style_selection=Valg_av_stil
 
 

diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -992,6 +992,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=Não_foi_possível_abrir_%0
 Unknown_import_format=Formato_de_importação_desconhecido
 Web_search=Pesquisa_na_Web
+Allow_file_links_relative_to_each_bib_file's_location=Permitir_links_de_arquivos_relativos_ao_local_do_arquivo_.bib
 Style_selection=Seleção_de_estilo
 No_valid_style_file_defined=Nenhum_estilo_válido_definido
 Choose_pattern=Escolher_modelo

diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
@@ -1735,6 +1735,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=Не_удалось_открыть_%0
 Unknown_import_format=Неизвестный_формат_импорта
 Web_search=Веб-поиск
+Allow_file_links_relative_to_each_bib_file's_location=Разрешить_относительные_ссылки_для_расположения_каждого_файла_BibTeX
 Style_selection=Выбор_стиля
 No_valid_style_file_defined=Не_определен_допустимый_файл_стиля
 Choose_pattern=Выбор_шаблона

diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
@@ -64,6 +64,7 @@ All_entries_of_this_type_will_be_declared_typeless._Continue?=
 All_fields=Alla_fält
 All_key_bindings_will_be_reset_to_their_defaults.=Alla_tangentbordsbindingar_kommer_att_återställas_till_standardvärden.
 All_subgroups_(recursively)=Alla_undergrupper_(rekursivt)
+Allow_file_links_relative_to_each_bib_file's_location=
 Allow_overwriting_existing_links.=Tillåt_att_befintliga_länkar_skrivs_över.
 Always_add_letter_(a,_b,_...)_to_generated_keys=Lägg_alltid_till_en_bokstav_(a,_b_...)_på_genererade_nycklar
 Always_reformat_.bib_file_on_save_and_export=Formattera_allid_om_.bib-filen_vid_när_den_sparas_eller_exporteras

diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
@@ -1012,6 +1012,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=%0_açılamıyor
 Unknown_import_format=Bilinmeyen_içe_aktarım_biçimi
 Web_search=Ağ_araması
+Allow_file_links_relative_to_each_bib_file's_location=Her_bib_dosyasının_konumuna_göre_dosya_bağlantılarına_izin_ver
 Style_selection=Stil_seçimi
 
 No_valid_style_file_defined=Geçerli_stil_dosyası_tanımlanmadı

diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
@@ -1765,6 +1765,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=
 Unknown_import_format=
 Web_search=
+Allow_file_links_relative_to_each_bib_file's_location=
 Style_selection=
 
 No_valid_style_file_defined=

diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
@@ -1067,6 +1067,7 @@ If_possible,_normalize_this_list_of_names_to_conform_to_standard_BibTeX_name_for
 Could_not_open_%0=无法打开_%0
 Unknown_import_format=未知的导入格式
 Web_search=网页搜索
+Allow_file_links_relative_to_each_bib_file's_location=允许文件链接使用基于_.bib_文件位置的相对路径
 Style_selection=引用样式选择
 
 No_valid_style_file_defined=没有找到合法的_style_文件
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2144,6 +2144,8 @@ Web_search=Webs\u00f8k



		Allow_file_links_relative_to_each_bib_file's_location=Tillat_fillenker_relativt_fra_katalogen_hvor_hver_bib-fil_ligger

		Style_selection=Valg_av_stil


Expand Down