Project

General

Profile

Revision ec35f482

IDec35f4823ed531a3edac9ab6d9ff7fae9789ce9f
Parent 16a514f4
Child a160d195

Added by Patrick Plitzner about 3 years ago

ref #7518 Soften colors for deduplication

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorLabelStyleConfiguration.java
14 14
import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
15 15
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
16 16
import org.eclipse.nebula.widgets.nattable.style.Style;
17
import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
17

  
18
import eu.etaxonomy.taxeditor.model.ColorResources;
19
import eu.etaxonomy.taxeditor.preference.Resources;
18 20

  
19 21
/**
20 22
 * @author pplitzner
......
27 29
        Style cellStyle = new Style();
28 30
        cellStyle.setAttributeValue(
29 31
                CellStyleAttributes.BACKGROUND_COLOR,
30
                GUIHelper.COLOR_YELLOW);
32
                ColorResources.getColor(Resources.COLOR_BULK_EDITOR_CANDIDATE));
31 33
        configRegistry.registerConfigAttribute(
32 34
                CellConfigAttributes.CELL_STYLE, cellStyle,
33 35
                DisplayMode.NORMAL, BulkEditorE4Composite.CANDIDATE_LABEL);
......
35 37
        cellStyle = new Style();
36 38
        cellStyle.setAttributeValue(
37 39
                CellStyleAttributes.BACKGROUND_COLOR,
38
                GUIHelper.COLOR_GREEN);
40
                ColorResources.getColor(Resources.COLOR_BULK_EDITOR_TARGET));
39 41
        configRegistry.registerConfigAttribute(
40 42
                CellConfigAttributes.CELL_STYLE, cellStyle,
41 43
                DisplayMode.NORMAL, BulkEditorE4Composite.TARGET_LABEL);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ColorResources.java
47 47
	}
48 48

  
49 49
	protected void initializeColorRegistry(ColorRegistry registry) {
50
	    registerColor(registry, Resources.COLOR_BULK_EDITOR_CANDIDATE, 243, 240, 165);
51
	    registerColor(registry, Resources.COLOR_BULK_EDITOR_TARGET, 135, 255, 135);
50 52
	    registerColor(registry, Resources.COLOR_COMPOSITE_BACKGROUND, 255,255,255);
51 53
	    registerColor(registry, Resources.COLOR_CONTROL_BACKGROUND, 220, 220, 220);
52 54
	    registerColor(registry, Resources.COLOR_CONTROL_SELECTED, 210, 210, 210);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/Resources.java
51 51
	/** Constant <code>COLOR_CONTROL_SELECTED_FOCUS="eu.etaxonomy.taxeditor.preferences.colo"{trunked}</code> */
52 52
	public static final String COLOR_CONTROL_SELECTED_FOCUS = "eu.etaxonomy.taxeditor.preferences.colorDefinition.nameEditor.colorContainerSelectedFocus";
53 53

  
54
	public static final String COLOR_BULK_EDITOR_CANDIDATE = "eu.etaxonomy.taxeditor.preferences.colorDefinition.bulkEditor.colorCandidate";
55

  
56
	public static final String COLOR_BULK_EDITOR_TARGET = "eu.etaxonomy.taxeditor.preferences.colorDefinition.bulkEditor.colorTarget";
57

  
54 58
	/** Constant <code>COLOR_COMPOSITE_BACKGROUND="eu.etaxonomy.taxeditor.preferences.colo"{trunked}</code> */
55 59
	public static final String COLOR_COMPOSITE_BACKGROUND = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeBackground";
56 60
	/** Constant <code>COLOR_COMPOSITE_IRRELEVANT="eu.etaxonomy.taxeditor.preferences.colo"{trunked}</code> */

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)