Skip to content

Commit

Permalink
GH-345 icon layout tweaks to better match look & feel pre changes (#355)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcorless
pcorless authored May 9, 2024
1 parent 8cfa6d2 commit 715db20
Show file tree
Hide file tree
Showing 28 changed files with 500 additions and 413 deletions.
2 changes: 1 addition & 1 deletion viewer/viewer-awt/src/main/java/org/icepdf/ri/common/DestinationCellRender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@SuppressWarnings("serial")
public class DestinationCellRender extends DefaultTreeCellRenderer {

protected static final Icon IMAGE_ICON = Images.getSingleIcon ("page", IconPack.Variant.NONE, Images.IconSize.TINY);
protected static final Icon IMAGE_ICON = Images.getSingleIcon("page", IconPack.Variant.NONE, Images.IconSize.TINY);

@Override
public Component getTreeCellRendererComponent(
Expand Down
9 changes: 3 additions & 6 deletions viewer/viewer-awt/src/main/java/org/icepdf/ri/common/DropDownButton.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.icepdf.ri.images.Images;

import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.logging.Logger;
Expand Down Expand Up @@ -55,11 +54,9 @@ public DropDownButton(Controller controller,
this.imageSize = imageSize;

if (imageName != null) {
Images.applyIcons (this, imageName, imageSize);

int h = Images.getHeightValueForIconSize (imageSize);
setPreferredSize (new Dimension (h, h));
Images.applyIcons(this, imageName, imageSize);
}
validate();

popupMenu = new JPopupMenu();

Expand All @@ -76,7 +73,7 @@ public void setEnabled(boolean b) {
@Override
public void setSelected(boolean b) {
super.setSelected(b);
Images.applyIcon (this, imageName, b ? IconPack.Variant.SELECTED : IconPack.Variant.NORMAL, imageSize);
Images.applyIcon(this, imageName, b ? IconPack.Variant.SELECTED : IconPack.Variant.NORMAL, imageSize);
}

public void add(JMenuItem menuItem, int idx) {
Expand Down
68 changes: 42 additions & 26 deletions viewer/viewer-awt/src/main/java/org/icepdf/ri/common/SwingViewBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,8 @@ public SwingViewBuilder(SwingController c, ViewerPropertiesManager properties,
overrideHighlightColor(propertiesManager);

// update View Controller with previewer document page fit and view type info
DocumentViewControllerImpl documentViewController = (DocumentViewControllerImpl) viewerController.getDocumentViewController();
DocumentViewControllerImpl documentViewController =
(DocumentViewControllerImpl) viewerController.getDocumentViewController();
documentViewController.setDocumentViewType(documentViewType, documentPageFitMode);

buttonFont = bf;
Expand All @@ -433,7 +434,7 @@ public SwingViewBuilder(SwingController c, ViewerPropertiesManager properties,
// set default view mode type, fit page, fit width, no-fit.
this.documentPageFitMode = documentPageFitMode;
// apply default button size
iconSize = Images.getDefaultIconSizeOr (propertiesManager, Images.IconSize.LARGE);
iconSize = Images.getDefaultIconSizeOr(propertiesManager, Images.IconSize.LARGE);
}

/**
Expand Down Expand Up @@ -514,8 +515,10 @@ public JMenuBar buildCompleteMenuBar() {
// Generate and register the MacOSAdapter, passing it a hash of all the methods we wish to
// use as delegates for various com.apple.eawt.ApplicationListener methods
// for legacy OS X, no longer works on macOS
MacOSAdapter.setQuitHandler(viewerController, viewerController.getClass().getDeclaredMethod("exit", (Class[]) null));
MacOSAdapter.setAboutHandler(viewerController, viewerController.getClass().getDeclaredMethod("showAboutDialog", (Class[]) null));
MacOSAdapter.setQuitHandler(viewerController, viewerController.getClass().getDeclaredMethod("exit",
(Class[]) null));
MacOSAdapter.setAboutHandler(viewerController, viewerController.getClass().getDeclaredMethod(
"showAboutDialog", (Class[]) null));
} catch (Exception e) {
logger.log(Level.FINE, "Error occurred while loading the MacOSAdapter:", e);
}
Expand Down Expand Up @@ -577,7 +580,7 @@ public JMenu buildFileMenu() {
JMenuItem openURLMenuItem = buildOpenURLMenuItem();
if (openFileMenuItem != null && openURLMenuItem != null) {
JMenu openSubMenu = new JMenu(messageBundle.getString("viewer.menu.open.label"));
Images.applyIcons (openSubMenu, "open", Images.IconSize.SMALL);
Images.applyIcons(openSubMenu, "open", Images.IconSize.SMALL);
addToMenu(openSubMenu, openFileMenuItem);
addToMenu(openSubMenu, openURLMenuItem);
addToMenu(fileMenu, openSubMenu);
Expand Down Expand Up @@ -680,7 +683,8 @@ public JMenuItem buildSaveAsFileMenuItem() {
public JMenuItem buildExportDocumentFileMenuItem() {
JMenuItem mi = makeMenuItem(
messageBundle.getString("viewer.menu.exportDocument.label"), null, null,
buildKeyStroke(KeyEventConstants.KEY_CODE_EXPORT_DOCUMENT, KeyEventConstants.MODIFIER_EXPORT_DOCUMENT, false));
buildKeyStroke(KeyEventConstants.KEY_CODE_EXPORT_DOCUMENT, KeyEventConstants.MODIFIER_EXPORT_DOCUMENT
, false));
if (viewerController != null && mi != null)
viewerController.setExportDocumentFileMenuItem(mi);
return mi;
Expand Down Expand Up @@ -1024,7 +1028,8 @@ public JMenuItem buildSearchMenuItem() {
}

public JMenuItem buildAdvancedSearchMenuItem() {
final JMenuItem mi = makeMenuItem(messageBundle.getString("viewer.toolbar.search.advanced.label"), buildKeyStroke(KeyEventConstants.KEY_CODE_SEARCH, KeyEventConstants.MODIFIER_ADVANCED_SEARCH));
final JMenuItem mi = makeMenuItem(messageBundle.getString("viewer.toolbar.search.advanced.label"),
buildKeyStroke(KeyEventConstants.KEY_CODE_SEARCH, KeyEventConstants.MODIFIER_ADVANCED_SEARCH));
if (viewerController != null) {
viewerController.setAdvancedSearchMenuItem(mi);
}
Expand Down Expand Up @@ -1460,7 +1465,7 @@ public JComboBox buildZoomCombBox() {

JComboBox<String> tmp = new JComboBox<>();
tmp.setToolTipText(messageBundle.getString("viewer.toolbar.zoom.tooltip"));
tmp.setPreferredSize(new Dimension(90, Images.getHeightValueForIconSize (iconSize)));
tmp.setPreferredSize(new Dimension(90, tmp.getPreferredSize().height));
for (float zoomLevel : zoomLevels)
tmp.addItem(NumberFormat.getPercentInstance().format(zoomLevel));
tmp.setEditable(true);
Expand All @@ -1483,7 +1488,7 @@ public JComboBox buildAnnotationPermissionCombBox() {
JComboBox<String> tmp = new JComboBox<>();
tmp.setToolTipText(messageBundle.getString(
"viewer.utilityPane.markupAnnotation.view.publicToggleButton.tooltip.label"));
tmp.setPreferredSize(new Dimension(65, Images.getHeightValueForIconSize (iconSize)));
tmp.setPreferredSize(new Dimension(65, tmp.getPreferredSize().height));
tmp.addItem(messageBundle.getString("viewer.utilityPane.markupAnnotation.view.publicToggleButton.label"));
tmp.addItem(messageBundle.getString("viewer.utilityPane.markupAnnotation.view.privateToggleButton.label"));
tmp.setEditable(true);
Expand Down Expand Up @@ -2290,7 +2295,8 @@ public JPanel buildStatusPanel() {
}

public JToggleButton buildPageViewSinglePageConToggleButton() {
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.continuous.singlePage.label"),
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.continuous" +
".singlePage.label"),
messageBundle.getString("viewer.toolbar.pageView.continuous.singlePage.tooltip"),
"single_page_column", iconSize,
buttonFont);
Expand All @@ -2300,7 +2306,8 @@ public JToggleButton buildPageViewSinglePageConToggleButton() {
}

public JToggleButton buildPageViewFacingPageConToggleButton() {
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.continuous.facingPage.label"),
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.continuous" +
".facingPage.label"),
messageBundle.getString("viewer.toolbar.pageView.continuous.facingPage.tooltip"),
"two_page_column", iconSize,
buttonFont);
Expand All @@ -2310,7 +2317,8 @@ public JToggleButton buildPageViewFacingPageConToggleButton() {
}

public JToggleButton buildPageViewSinglePageNonConToggleButton() {
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.nonContinuous.singlePage.label"),
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.nonContinuous" +
".singlePage.label"),
messageBundle.getString("viewer.toolbar.pageView.nonContinuous.singlePage.tooltip"),
"single_page", iconSize, buttonFont);
if (viewerController != null && btn != null)
Expand All @@ -2319,7 +2327,8 @@ public JToggleButton buildPageViewSinglePageNonConToggleButton() {
}

public JToggleButton buildPageViewFacingPageNonConToggleButton() {
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.nonContinuous.facingPage.label"),
JToggleButton btn = makeToolbarToggleButton(messageBundle.getString("viewer.toolbar.pageView.nonContinuous" +
".facingPage.label"),
messageBundle.getString("viewer.toolbar.pageView.nonContinuous.facingPage.tooltip"),
"two_page", iconSize, buttonFont);
if (viewerController != null && btn != null)
Expand All @@ -2336,16 +2345,16 @@ public JToggleButton buildPageViewFacingPageNonConToggleButton() {
* @param imageName display image name
* @param iconSize image size file extention constant
* @param font display font
*
* @return a button with the specified characteristics.
*/
protected JButton makeToolbarButton(
String title, String toolTip, String imageName, final Images.IconSize iconSize,
java.awt.Font font) {
JButton tmp = new JButton(showButtonText ? title : "");
tmp.setBorder(BorderFactory.createEmptyBorder());
tmp.setFont(font);
tmp.setToolTipText(toolTip);
Images.applyIcons (tmp, imageName, iconSize);
Images.applyIcons(tmp, imageName, iconSize);
tmp.setRolloverEnabled(true);
tmp.setBorderPainted(false);
tmp.setContentAreaFilled(false);
Expand All @@ -2354,8 +2363,10 @@ protected JButton makeToolbarButton(
return tmp;
}

protected AnnotationColorToggleButton makeAnnotationToggleButton(String title, String toolTip, String colorPreferenceKey,
String imageName, Images.IconSize imageSize, Font font, float alpha) {
protected AnnotationColorToggleButton makeAnnotationToggleButton(String title, String toolTip,
String colorPreferenceKey,
String imageName, Images.IconSize imageSize,
Font font, float alpha) {
return new IconAnnotationColorToggleButton(viewerController, messageBundle, title, toolTip,
colorPreferenceKey, imageName, imageSize, font, alpha);
}
Expand All @@ -2378,7 +2389,7 @@ protected JToggleButton makeToolbarToggleButton(
tmp.setToolTipText(toolTip);
tmp.setRolloverEnabled(true);

Images.applyIcons (tmp, imageName, iconSize);
Images.applyIcons(tmp, imageName, iconSize);
//tmp.setBorderPainted(false);
tmp.setBorder(BorderFactory.createEmptyBorder());
tmp.setContentAreaFilled(false);
Expand All @@ -2404,7 +2415,7 @@ protected JToggleButton makeToolbarToggleButtonSmall(
JToggleButton tmp = new JToggleButton(showButtonText ? title : "");
tmp.setFont(font);
tmp.setToolTipText(toolTip);
Images.applyIcons (tmp, imageName, iconSize);
Images.applyIcons(tmp, imageName, iconSize);
//tmp.setBorderPainted(false);
tmp.setBorder(BorderFactory.createEmptyBorder());
tmp.setContentAreaFilled(false);
Expand Down Expand Up @@ -2441,9 +2452,9 @@ protected JMenuItem makeMenuItem(String text, String imageName,
final Images.IconSize imageSize, KeyStroke accel) {
JMenuItem jmi = new JMenuItem(text);
if (imageName != null) {
Images.applyIcons (jmi, imageName, imageSize);
Images.applyIcons(jmi, imageName, imageSize);
} else {
Images.applyIcon (jmi, "menu_spacer", IconPack.Variant.NONE, Images.IconSize.SMALL);
Images.applyIcon(jmi, "menu_spacer", IconPack.Variant.NONE, Images.IconSize.SMALL);
}
jmi.setBorder(BorderFactory.createEmptyBorder());
jmi.setContentAreaFilled(false);
Expand Down Expand Up @@ -2500,18 +2511,23 @@ protected void overrideHighlightColor(ViewerPropertiesManager propertiesManager)
PageViewDecorator.pageColor = new Color(preferences.getInt(
ViewerPropertiesManager.PROPERTY_PAGE_VIEW_PAPER_COLOR, PageViewDecorator.pageColor.getRGB()));
PageViewDecorator.pageBorderColor = new Color(preferences.getInt(
ViewerPropertiesManager.PROPERTY_PAGE_VIEW_BACKGROUND_COLOR, PageViewDecorator.pageBorderColor.getRGB()));
ViewerPropertiesManager.PROPERTY_PAGE_VIEW_BACKGROUND_COLOR,
PageViewDecorator.pageBorderColor.getRGB()));
AbstractDocumentView.backgroundColour = new Color(preferences.getInt(
ViewerPropertiesManager.PROPERTY_PAGE_VIEW_BACKGROUND_COLOR, AbstractDocumentView.backgroundColour.getRGB()));
ViewerPropertiesManager.PROPERTY_PAGE_VIEW_BACKGROUND_COLOR,
AbstractDocumentView.backgroundColour.getRGB()));

// image reference type.
ImageReferenceFactory.imageReferenceType = ImageReferenceFactory.getImageReferenceType(
preferences.get(ViewerPropertiesManager.PROPERTY_IMAGING_REFERENCE_TYPE, "default"));

// advanced reference types.
Library.commonPoolThreads = preferences.getInt(ViewerPropertiesManager.PROPERTY_COMMON_THREAD_COUNT, Library.commonPoolThreads);
Library.imagePoolThreads = preferences.getInt(ViewerPropertiesManager.PROPERTY_IMAGE_PROXY_THREAD_COUNT, Library.imagePoolThreads);
ImageReference.useProxy = preferences.getBoolean(ViewerPropertiesManager.PROPERTY_IMAGE_PROXY_ENABLED, ImageReference.useProxy);
Library.commonPoolThreads = preferences.getInt(ViewerPropertiesManager.PROPERTY_COMMON_THREAD_COUNT,
Library.commonPoolThreads);
Library.imagePoolThreads = preferences.getInt(ViewerPropertiesManager.PROPERTY_IMAGE_PROXY_THREAD_COUNT,
Library.imagePoolThreads);
ImageReference.useProxy = preferences.getBoolean(ViewerPropertiesManager.PROPERTY_IMAGE_PROXY_ENABLED,
ImageReference.useProxy);

}

Expand Down
4 changes: 2 additions & 2 deletions viewer/viewer-awt/src/main/java/org/icepdf/ri/common/fonts/FontCellRender.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public Component getTreeCellRendererComponent(
tree, value, sel,
expanded, leaf, row,
hasFocus);
Icon icon = Images.getSingleIcon ("page", IconPack.Variant.NONE, Images.IconSize.TINY);
setOpenIcon (icon);
Icon icon = Images.getSingleIcon("page", IconPack.Variant.NONE, Images.IconSize.TINY);
setOpenIcon(icon);
setClosedIcon(icon);
setLeafIcon(icon);
return this;
Expand Down
Loading

0 comments on commit 715db20

Please sign in to comment.