From ee1d621e7946b88b8548e8d5146c4d5332d9a071 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Wed, 6 Nov 2013 15:02:18 +0000 Subject: [PATCH] - replaced "Edit" text with lock icons for title cache fields - we need to link back to the source for license reasons: " Silk icon set 1.3 _________________________________________ Mark James http://www.famfamfam.com/lab/icons/silk/ _________________________________________ This work is licensed under a Creative Commons Attribution 2.5 License. [ http://creativecommons.org/licenses/by/2.5/ ] This means you may use it for any purpose, and make any changes you like. All I ask is that you include a link back to this page in your credits. Are you using this icon set? Send me an email (including a link or picture if available) to mjames@gmail.com Any other questions about this icon set please contact mjames@gmail.com" --- .gitattributes | 2 + eu.etaxonomy.taxeditor.store/icons/lock.png | Bin 0 -> 749 bytes .../icons/lock_open.png | Bin 0 -> 727 bytes .../taxeditor/model/ImageResources.java | 91 ++++++++++-------- .../ui/element/ToggleableTextElement.java | 79 +++++++++------ 5 files changed, 100 insertions(+), 72 deletions(-) create mode 100644 eu.etaxonomy.taxeditor.store/icons/lock.png create mode 100644 eu.etaxonomy.taxeditor.store/icons/lock_open.png diff --git a/.gitattributes b/.gitattributes index 91d0cd516..1a425bf33 100644 --- a/.gitattributes +++ b/.gitattributes @@ -980,6 +980,8 @@ eu.etaxonomy.taxeditor.store/icons/import_wiz.gif -text eu.etaxonomy.taxeditor.store/icons/large_image.gif -text eu.etaxonomy.taxeditor.store/icons/leaf_detail.png -text eu.etaxonomy.taxeditor.store/icons/linkto_help.gif -text +eu.etaxonomy.taxeditor.store/icons/lock.png -text +eu.etaxonomy.taxeditor.store/icons/lock_open.png -text eu.etaxonomy.taxeditor.store/icons/lockedstate.gif -text eu.etaxonomy.taxeditor.store/icons/ma_12x12.gif -text eu.etaxonomy.taxeditor.store/icons/maximize.gif -text diff --git a/eu.etaxonomy.taxeditor.store/icons/lock.png b/eu.etaxonomy.taxeditor.store/icons/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..2ebc4f6f9663e32cad77d67ef93ab8843dfea3c0 GIT binary patch literal 749 zcmVe|tv9>?g+k#9o0pTxd@;_sq{kwlU;^VvV*?BV8P@}BoaZTQUROpWV6|-M`|^n&)=+8tHo3*<<$NU zU`%V~ZF;?hBSYsjJ6%JzV}E(D{pOLqQklliUf9um_tGl-wty`y*p?eYNW56P>X@1s zZs7KrRZKtmV7Lqj^5Fgr7_`LjhdJK@ltF&O`j7?*NUM$KvmNGz)3WjM?V$vHlPT0AFyF?kLE<#HZabCSW3-oa*6;Z zrXD`Ulwd<^2glP%1Y1Kc1Ij%DU^=ME(jKf6APNlA$Uu;J4bVilQHSWX5uJ$9Zsp4M z0%!@LvyTxz=Z6stxlichODIY+yNGt%RM;m`>H4LOKLFs9Y%b5aUN|2|{0Zw|<_~i} fmXz*V19AKYarLKlJyH=-*k3W|aiVYC~e{STzB+=%NyKm^5w z3m4+bm8cXnzG}0Gw2c^Ol0K$0_ity0#@^}dhsl97GUJu9lkxh`Okt_0|=(|h`!tol*)tahk*i! zgS8GLCq{|Gd7N1T=a4u`0gM4BU}M^~w|L$b3WtyL{rO$Q?PPfL6z$J7;&2In&vryC zqT@6`g9u_Zg@Xt1vO7RIY-D-g8eo{1!oIz%ujUZ52IBq#JOI%e5ertc^kIf}?KOA? zx9*6-2qdQcN5WDRs@&WP6I?Nxm{No*quRTbIBKa{opLb zA%3`w)e+)sGB0CNfHGetter for the field instance.

* @@ -46,8 +46,8 @@ public class ImageResources { } return instance; } - - + + /* *************************************************************************************** ICONS ************************************************************************************** */ @@ -115,6 +115,13 @@ public class ImageResources { public static final String IMG_NOT_FOUND = "IMG_NOT_FOUND"; /** Constant WARNING_ANNOTATION_ICON="warning" */ public static final String WARNING_ANNOTATION_ICON = "warning"; + + /** Constant LOCK_ICON="locked" */ + public static final String LOCK_ICON = "lock"; + + /** Constant LOCK_OPEN_ICON="lock_open" */ + public static final String LOCK_OPEN_ICON = "lock_open"; + /** Constant THREE_PRONGED_EQUAL="3_pronged_equal" */ public static final String THREE_PRONGED_EQUAL = "3_pronged_equal"; /** Constant TWO_PRONGED_EQUAL="2_pronged_equal" */ @@ -127,14 +134,14 @@ public class ImageResources { public static final String EXPAND_ALL = "expand_all"; /** Constant COLLAPSE_ALL="collapse_all" */ public static final String COLLAPSE_ALL = "collapse_all"; - - + + /*************************************************************************** * IMAGE REGISTRY **************************************************************************/ private ImageRegistry imageRegistry; - + /** *

getImageDescriptor

* @@ -154,20 +161,20 @@ public class ImageResources { public static Image getImage(String key) { return getInstance().getImageRegistry().get(key); } - + /** * Gets an image for the given URL. Adds the image to the registry as needed. * * @param uri a {@link java.net.URI} object. * @return a {@link org.eclipse.swt.graphics.Image} object. */ - public static Image getImage(URI uri) { - + public static Image getImage(URI uri) { + String key = uri.toString(); ImageRegistry registry = getInstance().getImageRegistry(); Image image = registry.get(key); - + if (image == null) { ImageDescriptor desc; try { @@ -181,19 +188,19 @@ public class ImageResources { } catch (Exception e) { StoreUtil.error(ImageResources.class, e); } - + // logger.warn(ImageDescriptor.getMissingImageDescriptor().getClass()); // logger.warn(desc.getClass()); -// +// // if (ImageDescriptor.getMissingImageDescriptor().equals(desc)) { // logger.warn("img not found"); // } - + } - + return image; } - + /** *

getImageNotFound

* @@ -222,13 +229,13 @@ public class ImageResources { * @param registry a {@link org.eclipse.jface.resource.ImageRegistry} object. */ protected void initializeImageRegistry(ImageRegistry registry) { - registerImage(registry, ADD_ICON, + registerImage(registry, ADD_ICON, "add_no_bg.gif"); - registerImage(registry, TRASH_ICON, + registerImage(registry, TRASH_ICON, "trash.gif"); - registerImage(registry, EDIT_ICON, + registerImage(registry, EDIT_ICON, "text.gif"); - registerImage(registry, EDIT_LOGO_ICON, + registerImage(registry, EDIT_LOGO_ICON, "edit_16x16.ico"); registerImage(registry, WARNING_ICON, "warn_tsk.gif"); @@ -240,11 +247,11 @@ public class ImageResources { "homosyn_original_no_bg.gif"); registerImage(registry, HETEROTYPIC_SYN_ICON, "heterosyn_no_bg.gif"); - registerImage(registry, NOM_INVAL_NUD_SYN_ICON, + registerImage(registry, NOM_INVAL_NUD_SYN_ICON, "nominval_nud_no_bg.gif"); registerImage(registry, HETEROTYPIC_SYN_ORIGINAL_ICON, "heterosyn_original_no_bg.gif"); - registerImage(registry, HOMOTYPIC_SYNONYM_IN_HETEROTYPIC_GROUP_ICON, + registerImage(registry, HOMOTYPIC_SYNONYM_IN_HETEROTYPIC_GROUP_ICON, "homotypic_syn_hetero_group.gif"); registerImage(registry, MISAPPLIED_NAME_ICON, "misapplied_no_bg.gif"); @@ -256,7 +263,7 @@ public class ImageResources { "basionym_no_bg.gif"); registerImage(registry, ORTHOGRAPHIC_VARIANT_ICON, "orthovariant_no_bg.gif"); - registerImage(registry, DB_ICON, + registerImage(registry, DB_ICON, "db.gif"); registerImage(registry, MOVE_ICON, "correction_change.gif"); @@ -264,7 +271,7 @@ public class ImageResources { "delete_edit.gif"); registerImage(registry, SYNONYM_TO_TAXON_ICON, "change.gif"); - registerImage(registry, OPEN_TAXON_ICON, + registerImage(registry, OPEN_TAXON_ICON, "open.gif"); registerImage(registry, ADD_CHILD_TAXON_ICON, "new_child.gif"); @@ -278,28 +285,32 @@ public class ImageResources { "error_co.gif"); registerImage(registry, EDIT_BITMAP_ICON, "256color_16x16.bmp"); - registerImage(registry, IMG_DATASOURCE_CONNECTED, + registerImage(registry, IMG_DATASOURCE_CONNECTED, "prj_obj.gif"); - registerImage(registry, IMG_DATASOURCE_DISCONNECTED, + registerImage(registry, IMG_DATASOURCE_DISCONNECTED, "cprj_obj.gif"); - registerImage(registry, IMG_NOT_FOUND, + registerImage(registry, IMG_NOT_FOUND, "pic_not_found.PNG"); - registerImage(registry, WARNING_ANNOTATION_ICON, + registerImage(registry, WARNING_ANNOTATION_ICON, "warning_co.gif"); - registerImage(registry, THREE_PRONGED_EQUAL, + registerImage(registry, THREE_PRONGED_EQUAL, "3_pronged_equal_small.GIF"); - registerImage(registry, TWO_PRONGED_EQUAL, - "2_pronged_equal_small.GIF"); - registerImage(registry, MISAPPLIED_NAME, - "ma_12x12.gif"); - registerImage(registry, ORPHANED_TAXON, - "orphaned.gif"); - registerImage(registry, EXPAND_ALL, + registerImage(registry, TWO_PRONGED_EQUAL, + "2_pronged_equal_small.GIF"); + registerImage(registry, MISAPPLIED_NAME, + "ma_12x12.gif"); + registerImage(registry, ORPHANED_TAXON, + "orphaned.gif"); + registerImage(registry, EXPAND_ALL, "expandAll.jpg"); - registerImage(registry, COLLAPSE_ALL, + registerImage(registry, COLLAPSE_ALL, "collapseall.gif"); - registerImage(registry, BROWSE_ICON, + registerImage(registry, BROWSE_ICON, "prj_obj.gif"); + registerImage(registry, LOCK_ICON, + "lock.png"); + registerImage(registry, LOCK_OPEN_ICON, + "lock_open.png"); } private void registerImage(ImageRegistry registry, String key, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java index e49ca357c..f7c5f5ba6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ @@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import eu.etaxonomy.taxeditor.model.ImageResources; import eu.etaxonomy.taxeditor.preference.Resources; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -38,14 +39,14 @@ import eu.etaxonomy.taxeditor.store.StoreUtil; */ public class ToggleableTextElement extends AbstractCdmFormElement implements SelectionListener, ModifyListener, IEnableableFormElement, ISelectable { - private Text text_cache; - private Button button_toggle; - + private final Text text_cache; + private final Button button_toggle; + private boolean state; - private Set selectionListener = new HashSet(); - private Label label; - private Composite container; - + private final Set selectionListener = new HashSet(); + private final Label label; + private final Composite container; + /** *

Constructor for ToggleableTextElement.

* @@ -59,15 +60,15 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel protected ToggleableTextElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString, String initialText, boolean initialState, int style) { super(formFactory, parentElement); - + label = formFactory.createLabel(getLayoutComposite(), labelString, style); addControl(label); - - container = formFactory.createComposite(getLayoutComposite(), SWT.WRAP); + + container = formFactory.createComposite(getLayoutComposite(), SWT.WRAP); container.setLayout(LayoutConstants.LAYOUT(2, false)); container.setLayoutData(LayoutConstants.FILL_HORIZONTALLY()); addControl(container); - + text_cache = formFactory.createText(container, initialText, SWT.WRAP | SWT.MULTI); addControl(text_cache); text_cache.addModifyListener(this); @@ -77,15 +78,18 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel text_cache.addKeyListener( new KeyAdapter(){ @Override public void keyPressed(KeyEvent e) { - if(e.character == SWT.CR) - e.doit = false; + if(e.character == SWT.CR) { + e.doit = false; + } } }); - + button_toggle = formFactory.createButton(container, "Edit", SWT.TOGGLE); + button_toggle.setText(""); + button_toggle.setImage(ImageResources.getImage(ImageResources.LOCK_ICON)); addControl(button_toggle); button_toggle.addSelectionListener(this); - + setState(initialState); } @@ -98,7 +102,7 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel if(text != null){ // store current caret position int caretPosition = text_cache.getCaretPosition(); - + text_cache.removeModifyListener(this); text_cache.setText(text); text_cache.addModifyListener(this); @@ -116,7 +120,7 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel public String getText(){ return text_cache.getText(); } - + /** *

Setter for the field state.

* @@ -126,9 +130,10 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel this.state = state; setEnabled(state); } - + /** {@inheritDoc} */ - public void setEnabled(boolean enabled) { + @Override + public void setEnabled(boolean enabled) { text_cache.setEnabled(enabled); String symbolicName = enabled ? Resources.COLOR_FONT_DEFAULT : Resources.COLOR_TEXT_DISABLED; text_cache.setForeground(StoreUtil.getColor(symbolicName)); @@ -143,19 +148,26 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel public boolean getState(){ return state; } - + /* (non-Javadoc) * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) */ /** {@inheritDoc} */ - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { + if(button_toggle.getSelection()){ + button_toggle.setImage(ImageResources.getImage(ImageResources.LOCK_OPEN_ICON)); + } + else{ + button_toggle.setImage(ImageResources.getImage(ImageResources.LOCK_ICON)); + } setState(button_toggle.getSelection()); for(SelectionListener listener : selectionListener){ listener.widgetSelected(e); } firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); } - + /** *

addSelectionListener

* @@ -164,7 +176,7 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel public void addSelectionListener(SelectionListener listener){ selectionListener.add(listener); } - + /** *

removeSelectionListener

* @@ -173,30 +185,33 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel public void removeSelectionListener(SelectionListener listener){ selectionListener.remove(listener); } - + /** {@inheritDoc} */ - public void widgetDefaultSelected(SelectionEvent e) {} + @Override + public void widgetDefaultSelected(SelectionEvent e) {} /** {@inheritDoc} */ - public void modifyText(ModifyEvent e) { + @Override + public void modifyText(ModifyEvent e) { firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); } /** {@inheritDoc} */ - public void setIrrelevant(boolean irrelevant) { + @Override + public void setIrrelevant(boolean irrelevant) { String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND; - + Color color = getColor(colorId); text_cache.setBackground(color); } - + /** {@inheritDoc} */ @Override public void setBackground(Color color) { label.setBackground(color); container.setBackground(color); } - + @Override public void setSelected(boolean selected) { setBackground(selected ? SELECTED : getPersistentBackground()); -- 2.34.1