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

Show origin info #153

Merged
merged 12 commits into from
Mar 25, 2021
Merged

Show origin info #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2f91945
Fixes conflict with PropertiesManager renaming
gtache Feb 12, 2020
693213f
Merge branch 'master' of github.com:pcorless/icepdf
gtache Feb 17, 2020
db0b33f
Merge branch 'master' of github.com:pcorless/icepdf
gtache Feb 28, 2020
a4b0f97
Merge branch 'master' of github.com:pcorless/icepdf
gtache May 12, 2020
f3f99cd
Merge branch 'master' of github.com:pcorless/icepdf
gtache May 14, 2020
ef55851
Merge branch 'master' of github.com:pcorless/icepdf
gtache Jul 8, 2020
ac12aaa
Merge branch 'master' of github.com:pcorless/icepdf
gtache Aug 17, 2020
8b28b29
Merge branch 'master' of github.com:pcorless/icepdf
gtache Aug 21, 2020
2bcaafc
Merge branch 'master' of github.com:pcorless/icepdf
gtache Sep 8, 2020
35cc9b2
Merge branch 'master' of github.com:pcorless/icepdf
gtache Sep 22, 2020
40581e1
Merge branch 'master' of github.com:pcorless/icepdf
gtache Sep 24, 2020
030ba1e
GH-152 Adds origin/location to InformationPanel
gtache Oct 15, 2020
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
16 changes: 15 additions & 1 deletion viewer/viewer-awt/src/main/java/org/icepdf/ri/common/properties/InformationPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public InformationPanel(Document document,
String producer = "";
String creationDate = "";
String modDate = "";
final String path;

// get duplicate names from message bundle
String notAvailable =
Expand All @@ -66,7 +67,17 @@ public InformationPanel(Document document,
modDate = documentInfo.getModDate() != null ?
documentInfo.getModDate().toString() : notAvailable;
}

final String origin = document.getDocumentOrigin();
if (origin == null || origin.isEmpty()) {
final String location = document.getDocumentLocation();
if (location == null || location.isEmpty()) {
path = "";
} else {
path = location;
}
} else {
path = origin;
}
setLayout(new GridBagLayout());
setAlignmentY(JPanel.TOP_ALIGNMENT);

Expand Down Expand Up @@ -110,6 +121,8 @@ public InformationPanel(Document document,
addGB(layoutPanel, new JLabel(
messageBundle.getString("viewer.dialog.documentInformation.modified.label")),
0, 7, 1, 1);
addGB(layoutPanel, new JLabel(messageBundle.getString("viewer.dialog.documentInformation.path.label")),
0, 8, 1, 1);

// add values
constraints.anchor = GridBagConstraints.NORTHWEST;
Expand All @@ -121,6 +134,7 @@ public InformationPanel(Document document,
addGB(layoutPanel, new JLabel(producer), 1, 5, 1, 1);
addGB(layoutPanel, new JLabel(creationDate), 1, 6, 1, 1);
addGB(layoutPanel, new JLabel(modDate), 1, 7, 1, 1);
addGB(layoutPanel, new JLabel(path), 1, 8, 1, 1);
constraints.anchor = GridBagConstraints.NORTH;
constraints.fill = GridBagConstraints.HORIZONTAL;
constraints.insets = new Insets(5, 5, 5, 5);
Expand Down
1 change: 1 addition & 0 deletions viewer/viewer-awt/src/main/resources/org/icepdf/ri/resources/MessageBundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@ viewer.dialog.documentInformation.creator.label=Creator:
viewer.dialog.documentInformation.producer.label=Producer:
viewer.dialog.documentInformation.created.label=Created:
viewer.dialog.documentInformation.modified.label=Modified:
viewer.dialog.documentInformation.path.label=Path:
viewer.dialog.documentInformation.notAvailable=Not Available
## Go to Page Dialog
viewer.dialog.goToPage.title=Go to Page...
Expand Down