BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3e1ed38
)
Add icon for switching to advanced media view
author
Patrick Plitzner
<p.plitzner@bgbm.org>
Mon, 29 Jun 2015 14:01:34 +0000
(16:01 +0200)
committer
Patrick Plitzner
<p.plitzner@bgbm.org>
Mon, 29 Jun 2015 14:02:00 +0000
(16:02 +0200)
eu.etaxonomy.taxeditor.store/icons/switch_view_type-16x16-32.gif
[new file with mode: 0644]
patch
|
blob
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaViewSwitch.java
patch
|
blob
|
history
diff --git a/eu.etaxonomy.taxeditor.store/icons/switch_view_type-16x16-32.gif
b/eu.etaxonomy.taxeditor.store/icons/switch_view_type-16x16-32.gif
new file mode 100644
(file)
index 0000000..
c7e0ebd
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/switch_view_type-16x16-32.gif differ
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
index 51dcd8413270ab709099fb4e023837983396c784..14fa63ae364f4220339f82cad2496c0300b3db9b 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
@@
-134,6
+134,9
@@
public class ImageResources {
/** Constant <code>COLLAPSE_ALL="collapse_all"</code> */
public static final String COLLAPSE_ALL = "collapse_all";
/** Constant <code>COLLAPSE_ALL="collapse_all"</code> */
public static final String COLLAPSE_ALL = "collapse_all";
+ public static final String SWITCH_VIEW_TYPE = "switch_view_type";
+
+ //derivative icons
public static final String TISSUE_SAMPLE_DERIVATE = "tissue_sample_derivate";
public static final String TISSUE_SAMPLE_DERIVATE_CHARACTER_DATA = "tissue_sample_derivate_character_data";
public static final String DNA_SAMPLE_DERIVATE = "dna_sample_derivate";
public static final String TISSUE_SAMPLE_DERIVATE = "tissue_sample_derivate";
public static final String TISSUE_SAMPLE_DERIVATE_CHARACTER_DATA = "tissue_sample_derivate_character_data";
public static final String DNA_SAMPLE_DERIVATE = "dna_sample_derivate";
@@
-333,6
+336,8
@@
public class ImageResources {
"lock.png");
registerImage(registry, LOCK_OPEN_ICON,
"lock_open.png");
"lock.png");
registerImage(registry, LOCK_OPEN_ICON,
"lock_open.png");
+ registerImage(registry, SWITCH_VIEW_TYPE,
+ "switch_view_type-16x16-32.gif");
registerImage(registry, DNA_SAMPLE_DERIVATE,
"dna_derivate-16x16-32.png");
registerImage(registry, DNA_SAMPLE_DERIVATE_CHARACTER_DATA,
registerImage(registry, DNA_SAMPLE_DERIVATE,
"dna_derivate-16x16-32.png");
registerImage(registry, DNA_SAMPLE_DERIVATE_CHARACTER_DATA,
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
index aa51d360596433e3e939b1a7d471c36e967194a0..517e9cfd36504917d02a711a9d1e9535d3a1b8fb 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
@@
-14,6
+14,7
@@
import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.common.LanguageString;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.cdm.model.common.LanguageString;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.ImageResources;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.dialog.selection.MediaSelectionDialog;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.dialog.selection.MediaSelectionDialog;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
@@
-47,8
+48,8
@@
public class MediaMetaElement extends AbstractEntityCollectionElement<Media> imp
public void createControls(ICdmFormElement element, int style) {
final IAction switchAction = MediaViewSwitch.createSwitch(MediaMetaElement.this);
Button btnToggleAdvancedMediaView = new Button(getBox(), style);
public void createControls(ICdmFormElement element, int style) {
final IAction switchAction = MediaViewSwitch.createSwitch(MediaMetaElement.this);
Button btnToggleAdvancedMediaView = new Button(getBox(), style);
- btnToggleAdvancedMediaView.setText(switchAction.getText());
btnToggleAdvancedMediaView.setToolTipText(switchAction.getText());
btnToggleAdvancedMediaView.setToolTipText(switchAction.getText());
+ btnToggleAdvancedMediaView.setImage(ImageResources.getImage(ImageResources.SWITCH_VIEW_TYPE));
btnToggleAdvancedMediaView.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
btnToggleAdvancedMediaView.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaViewSwitch.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaViewSwitch.java
index 0506ebfa8f32813d8e77e53108bc4f783bb3bb1a..ce598fbadffbc247557b7e157138f9502d97b7d0 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaViewSwitch.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaViewSwitch.java
@@
-12,6
+12,8
@@
package eu.etaxonomy.taxeditor.ui.section.media;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
+import eu.etaxonomy.taxeditor.model.ImageResources;
+
/**
* Adds a switch to a section with an {@link ITogglableMediaElement}
* to allow switching between simple and advanced media view
/**
* Adds a switch to a section with an {@link ITogglableMediaElement}
* to allow switching between simple and advanced media view
@@
-28,7
+30,7
@@
public class MediaViewSwitch {
public static IAction createSwitch(final ITogglableMediaElement togglableMediaElement) {
final String label = "Change View Type";
public static IAction createSwitch(final ITogglableMediaElement togglableMediaElement) {
final String label = "Change View Type";
- Action switchAction = new Action(label, I
Action.AS_PUSH_BUTTON
) {
+ Action switchAction = new Action(label, I
mageResources.getImageDescriptor(ImageResources.SWITCH_VIEW_TYPE)
) {
@Override
public void run() {
if(togglableMediaElement!=null){
@Override
public void run() {
if(togglableMediaElement!=null){