From 077a92077d801eb08716620525547a4b851d7237 Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Thu, 14 Oct 2021 19:37:56 +0200 Subject: [PATCH 1/6] Disable fit to width by default and rename linked file settings --- .../jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml | 4 ++-- src/main/java/org/jabref/preferences/JabRefPreferences.java | 2 +- src/main/resources/l10n/JabRef_en.properties | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml index c5948e935ea..8b21117b5b3 100644 --- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml @@ -36,10 +36,10 @@ - + + text="%When downloading files, or moving linked files to the file directory, use the BIB file location. This takes precedence over all other configured file directories"/> diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index 325898a86c8..1fea86c6abd 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -509,7 +509,7 @@ private JabRefPreferences() { defaults.put(SIZE_X, 1024); defaults.put(SIZE_Y, 768); defaults.put(WINDOW_MAXIMISED, Boolean.TRUE); - defaults.put(AUTO_RESIZE_MODE, Boolean.TRUE); + defaults.put(AUTO_RESIZE_MODE, Boolean.FALSE); // Fit table horizontally on the screen defaults.put(ENTRY_EDITOR_HEIGHT, 0.65); defaults.put(NAMES_AS_IS, Boolean.FALSE); // "Show names unchanged" defaults.put(NAMES_FIRST_LAST, Boolean.FALSE); // "Show 'Firstname Lastname'" diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index fa058688e00..0b57953dbea 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -1065,7 +1065,7 @@ Web\ search=Web search Style\ selection=Style selection No\ valid\ style\ file\ defined=No valid style file defined Choose\ pattern=Choose pattern -Search\ and\ store\ files\ relative\ to\ library\ file\ location=Search and store files relative to library file location +Search\ and\ store\ files\ relative\ to\ bib\ file\ location=Search and store files relative to bib file location Could\ not\ run\ the\ gnuclient/emacsclient\ program.\ Make\ sure\ you\ have\ the\ emacsclient/gnuclient\ program\ installed\ and\ available\ in\ the\ PATH.=Could not run the gnuclient/emacsclient program. Make sure you have the emacsclient/gnuclient program installed and available in the PATH. You\ must\ select\ either\ a\ valid\ style\ file,\ or\ use\ one\ of\ the\ default\ styles.=You must select either a valid style file, or use one of the default styles. @@ -1164,7 +1164,7 @@ Removed\ all\ subgroups\ of\ group\ "%0".=Removed all subgroups of group "%0". To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=To disable the memory stick mode rename or remove the jabref.xml file in the same folder as JabRef. Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Unable to connect. One possible reason is that JabRef and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode. Delimiter(s)=Delimiter(s) -When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ prefer\ the\ BIB\ file\ location\ rather\ than\ the\ file\ directory\ set\ above=When downloading files, or moving linked files to the file directory, prefer the BIB file location rather than the file directory set above +When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ BIB\ file\ location.\ This\ takes\ precedence\ over\ all\ other\ configured\ file\ directories=When downloading files, or moving linked files to the file directory, use the BIB file location. This takes precedence over all other configured file directories Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the character format '%0', which is undefined in your current OpenOffice/LibreOffice document. Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the paragraph format '%0', which is undefined in your current OpenOffice/LibreOffice document. From fb70d64598aab704d7d3b28d7fad02d339392b8f Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sun, 17 Oct 2021 14:20:14 +0200 Subject: [PATCH 2/6] adust l10n, clarify comment --- .../org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml | 2 +- src/main/java/org/jabref/preferences/JabRefPreferences.java | 2 +- src/main/resources/l10n/JabRef_en.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml index 8b21117b5b3..533234d2cb8 100644 --- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml @@ -39,7 +39,7 @@ + text="%When downloading files, or moving linked files to the file directory, use the bib file location. This takes precedence over all other configured file directories."/> diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index dd9c9cc7c65..dc963b28e9b 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -510,7 +510,7 @@ private JabRefPreferences() { defaults.put(SIZE_X, 1024); defaults.put(SIZE_Y, 768); defaults.put(WINDOW_MAXIMISED, Boolean.TRUE); - defaults.put(AUTO_RESIZE_MODE, Boolean.FALSE); // Fit table horizontally on the screen + defaults.put(AUTO_RESIZE_MODE, Boolean.FALSE); // By default disable "Fit table horizontally on the screen" defaults.put(ENTRY_EDITOR_HEIGHT, 0.65); defaults.put(NAMES_AS_IS, Boolean.FALSE); // "Show names unchanged" defaults.put(NAMES_FIRST_LAST, Boolean.FALSE); // "Show 'Firstname Lastname'" diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index 0b57953dbea..3175847bfaf 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -1164,7 +1164,7 @@ Removed\ all\ subgroups\ of\ group\ "%0".=Removed all subgroups of group "%0". To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=To disable the memory stick mode rename or remove the jabref.xml file in the same folder as JabRef. Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Unable to connect. One possible reason is that JabRef and OpenOffice/LibreOffice are not both running in either 32 bit mode or 64 bit mode. Delimiter(s)=Delimiter(s) -When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ BIB\ file\ location.\ This\ takes\ precedence\ over\ all\ other\ configured\ file\ directories=When downloading files, or moving linked files to the file directory, use the BIB file location. This takes precedence over all other configured file directories +When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.\ This\ takes\ precedence\ over\ all\ other\ configured\ file\ directories.=When downloading files, or moving linked files to the file directory, use the bib file location. This takes precedence over all other configured file directories. Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the character format '%0', which is undefined in your current OpenOffice/LibreOffice document. Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the paragraph format '%0', which is undefined in your current OpenOffice/LibreOffice document. From d7c53d3519f3398aa93072b68c7d576cf131a2cb Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Fri, 22 Oct 2021 20:27:01 +0200 Subject: [PATCH 3/6] Add new Toggle Group for File Directory --- .../gui/preferences/linkedfiles/LinkedFilesTab.fxml | 13 ++++++++----- .../gui/preferences/linkedfiles/LinkedFilesTab.java | 9 +++++++-- .../linkedfiles/LinkedFilesTabViewModel.java | 7 ++++++- src/main/resources/l10n/JabRef_en.properties | 3 ++- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml index 583b66892b6..a83666792df 100644 --- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml +++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml @@ -20,12 +20,15 @@ + + +