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

Disable fit to width by default and rename linked file settings #8148

Merged
merged 11 commits into from
Oct 23, 2021
Merged

Disable fit to width by default and rename linked file settings #8148

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
077a920
Disable fit to width by default and rename linked file settings
Siedlerchr Oct 14, 2021
a18cfbb
Merge remote-tracking branch 'upstream/main' into disableColumnFitToW…
Siedlerchr Oct 16, 2021
9ea1fc8
Merge remote-tracking branch 'upstream/main' into disableColumnFitToW…
Siedlerchr Oct 17, 2021
fb70d64
adust l10n, clarify comment
Siedlerchr Oct 17, 2021
93f3bba
Merge remote-tracking branch 'upstream/main' into disableColumnFitToW…
Siedlerchr Oct 18, 2021
374f8ba
Merge remote-tracking branch 'upstream/main' into disableColumnFitToW…
Siedlerchr Oct 18, 2021
bdb087f
Merge remote-tracking branch 'upstream/main' into disableColumnFitToW…
Siedlerchr Oct 22, 2021
d7c53d3
Add new Toggle Group for File Directory
Siedlerchr Oct 22, 2021
2713028
add changelog
Siedlerchr Oct 22, 2021
ee62697
Update src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFil…
Siedlerchr Oct 22, 2021
4f5ec5c
Update src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFil…
Siedlerchr Oct 22, 2021
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
4 changes: 2 additions & 2 deletions src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
</tooltip>
</Button>
</HBox>
<CheckBox fx:id="useBibLocationAsPrimary" text="%Search and store files relative to library file location">
<CheckBox fx:id="useBibLocationAsPrimary" text="%Search and store files relative to bib file location">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion, "library file" or maybe shorter "library" is more consistent with other usages (e.g. Create new library).
But in either case the tooltip should use the same convention (and not BIB file).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I explicitly wanted to use bib file location as we had it back in the past , because otherwise users think they have to enable this for library specific directory which in fact does the opposite

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

Search and store files relative to library (.bib file) location

<tooltip>
<Tooltip
text="%When downloading files, or moving linked files to the file directory, prefer the BIB file location rather than the file directory set above"/>
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."/>
</tooltip>
</CheckBox>
<CheckBox fx:id="searchFilesOnOpen" text="%When opening file link, search for matching file if no link is defined"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/preferences/JabRefPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.TRUE);
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'"
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/l10n/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down